root/yiBinGaoCe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:入库接口和工单接口查询页面优化

Browse Source
This commit is contained in:
zds
2024-09-10 16:46:54 +08:00
parent 2cdecb7c9b
commit 5806db8792
6 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/dto/MaterialQuery.java
View File

@@ -18,4 +18,6 @@ public class MaterialQuery implements Serializable {
private String supplierCode;
//绑定状态
private String group_bind_material_status;
//绑定状态
private String return_status;
}

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java
View File

@@ -35,7 +35,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),Material::getProductName,whereJson.getProductName());
wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),Material::getSupplierCode,whereJson.getSupplierCode());
wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),Material::getProductDescription,whereJson.getProductDescription());
wrapper.like(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());
wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());
wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),Material::getReturn_status,whereJson.getReturn_status());
wrapper.orderByDesc(Material::getCreate_time);
pages = materialMapper.selectPage(pages, wrapper);
return pages;
}

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java
View File

@@ -330,17 +330,6 @@ public class YCLCKTask extends AbstractTask {
.execute().body();
log.info("QPMES065服务调用成功，反馈{}",resultMsg);
JSONObject result = JSONObject.parseObject(resultMsg);
String Code = result.getString("Code");
if(ObjectUtil.isNotEmpty(Code) && "0".equals(Code)){
//更新接口表
LambdaUpdateWrapper<Material> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2());
updateWrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue());
//回传状态为0的
updateWrapper.eq(Material::getReturn_status,"1");
updateWrapper.set(Material::getReturn_status,"2");
materialMapper.update(null,updateWrapper);
}
String code = result.getString("code");
if(ObjectUtil.isNotEmpty(code) && "0".equals(code)){
//更新接口表

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
View File

@@ -69,7 +69,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()), Workorder::getProductName,whereJson.getProductName());
wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()), Workorder::getSupplierCode,whereJson.getSupplierCode());
wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()), Workorder::getProductDescription,whereJson.getProductDescription());
wrapper.like(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
wrapper.eq(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
wrapper.orderByDesc(Workorder::getCreateTime);
pages = workorderMapper.selectPage(pages, wrapper);
return pages;
}