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

rev:分支合并修复

Browse Source
This commit is contained in:
zhangzq
2023-12-13 17:31:22 +08:00
parent 3610044642
commit 9f2b73a49f
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
View File

@@ -70,14 +70,15 @@ public class PdmProduceWorkorderController{
@Log("查询工单管理") @Log("查询工单管理")
//("查询工单管理") //("查询工单管理")
public ResponseEntity<Object> queryPad(@RequestBody WorkorderQuery query) { public ResponseEntity<Object> queryPad(@RequestBody WorkorderQuery query) {
PageQuery page = new PageQuery(); PageQuery page = new PageQuery();page.setPage(0);page.setSize(99);
page.setPage(0);
page.setSize(99);
query.setOrder_status(WorkerOrderEnum.PRODUCTING.getCode()); query.setOrder_status(WorkerOrderEnum.PRODUCTING.getCode());
TableDataInfo tableDataInfo = iPdmProduceWorkorderService.queryAll(query, page); TableDataInfo tableDataInfo = iPdmProduceWorkorderService.queryAll(query, page);
List content = tableDataInfo.getContent(); List content = tableDataInfo.getContent();
content.add(MapOf.of("device_code", "A1_KZ_14", "workorder_code", "刻字回流点", "material_code", "刻字回流点", "material_spec", "刻字回流点", "material_name", "刻字回流点")); content.add(MapOf.of("device_code","A1_KZ_14",
return new ResponseEntity<>(tableDataInfo, HttpStatus.OK); "workorder_code","刻字回流点",
"material_code","刻字回流点",
"material_spec","刻字回流点","material_name","刻字回流点"));
return new ResponseEntity<>(tableDataInfo,HttpStatus.OK);
} }
@PostMapping("/create") @PostMapping("/create")

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
View File

@@ -34,7 +34,7 @@
and find_in_set(ShiftOrder.workorder_status, #{query.order_status}) and find_in_set(ShiftOrder.workorder_status, #{query.order_status})
</if> </if>
<if test="query.device_code != null and query.device_code != ''"> <if test="query.device_code != null and query.device_code != ''">
and ShiftOrder.device_code like concat('%',#{query.device_code},'%') and ShiftOrder.device_code like '%${query.device_code}%'
</if> </if>
<if test="query.create_type != null and query.create_type != ''"> <if test="query.create_type != null and query.create_type != ''">
and ShiftOrder.create_type = #{query.create_type} and ShiftOrder.create_type = #{query.create_type}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
View File

@@ -440,6 +440,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
workorder.setUpdate_id(SecurityUtils.getCurrentUserId()); workorder.setUpdate_id(SecurityUtils.getCurrentUserId());
workorder.setUpdate_name(SecurityUtils.getCurrentNickName()); workorder.setUpdate_name(SecurityUtils.getCurrentNickName());
workorder.setReal_qty(null); workorder.setReal_qty(null);
workorder.setStop_time(DateUtil.now());
this.updateById(workorder); this.updateById(workorder);
//更新刻字数量 //更新刻字数量
//todo 测试是否累加还是直接更新报工数量 //todo 测试是否累加还是直接更新报工数量
@@ -861,6 +862,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
workOrder.setUpdate_id(SecurityUtils.getCurrentUserId()); workOrder.setUpdate_id(SecurityUtils.getCurrentUserId());
workOrder.setUpdate_name(SecurityUtils.getCurrentNickName()); workOrder.setUpdate_name(SecurityUtils.getCurrentNickName());
workOrder.setAps_realproducestart_date(getDates(workOrder.getPlanproducestart_date(),workOrder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss")); workOrder.setAps_realproducestart_date(getDates(workOrder.getPlanproducestart_date(),workOrder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
workOrder.setRepare_qty(new BigDecimal(0));
workOrder.setReal_qty(null); workOrder.setReal_qty(null);
workOrder.setAps_assign_qty(workOrder.getPlan_qty()); workOrder.setAps_assign_qty(workOrder.getPlan_qty());
workOrder.setOpen_time(DateUtil.now()); workOrder.setOpen_time(DateUtil.now());