geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
shunyi.kuang
2026-01-12 13:32:03 +08:00
parent 47f675f9b6
commit 6ac9486ae4
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/controller/CustomerController.java
View File

@ -81,7 +81,7 @@ public class CustomerController {
.like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode()) .like(StrUtil.isNotBlank(dto.getNatureCode()),LngCustomer::getNatureCode,dto.getNatureCode())
.eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid()) .eq(StrUtil.isNotBlank(dto.getValid()),LngCustomer::getValid,dto.getValid())
.like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode()) .like(StrUtil.isNotBlank(dto.getApproCode()),LngCustomer::getApproCode,dto.getApproCode())
.orderByAsc(LngCustomer::getCuCode); .orderByDesc(LngCustomer::getCuCode);
IPage<LngCustomer> page = customerService.page(ConventPage.getPage(dto), queryWrapper); IPage<LngCustomer> page = customerService.page(ConventPage.getPage(dto), queryWrapper);
PageOutput<LngCustomerPageVo> pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class); PageOutput<LngCustomerPageVo> pageOutput = ConventPage.getPageOutput(page, LngCustomerPageVo.class);
return R.ok(pageOutput); return R.ok(pageOutput);

3
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/supplier/controller/SupplierController.java
View File

@ -106,8 +106,7 @@ public class SupplierController {
@SaCheckPermission("supplier:add") @SaCheckPermission("supplier:add")
public R add(@Valid @RequestBody UpdateLngSupplierDto dto){ public R add(@Valid @RequestBody UpdateLngSupplierDto dto){
String code = codeRuleClient.genEncode(SUPPLIER_CODE); String code = codeRuleClient.genEncode(SUPPLIER_CODE);
dto.setSuCode("S"+code); dto.setSuCode("GEG-S"+code);
//UpdateLngSupplierDto res = dataService.insert(dto);
return R.ok(dataService.insert(dto,new DataOperationListener<UpdateLngSupplierDto>() { return R.ok(dataService.insert(dto,new DataOperationListener<UpdateLngSupplierDto>() {