From aa54150593e01d608f3f641af954aec83059d61d Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Tue, 15 Aug 2023 19:12:40 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9A=E4=B8=89=E7=BA=BF=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderExt/dao/MpsSaleOrderIcExt.java | 10 +++ .../MpsSaleOrderIcExtController.java | 12 +++ .../user/impl/ISysUserServiceImpl.java | 2 +- .../views/system/user/center/updatePass.vue | 4 +- .../wms/old_manage/old_package/index.vue | 4 +- .../product_manage/workorder/ViewDialog.vue | 67 ++++++++++++++- .../wms/product_manage/workorder/index.vue | 85 ++++++++++++++++++- 7 files changed, 175 insertions(+), 9 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java index eb6bdf39..38c543e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java @@ -31,6 +31,16 @@ public class MpsSaleOrderIcExt implements Serializable { */ private Integer seq_no; + /** + * print_序号 + */ + private Integer print_no; + + /** + * 物料规格 + */ + private String material_code; + /** * 包装袋类型 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java index ac7003a9..9a37befb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.anno.Log; import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService; import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt; +import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -28,6 +29,8 @@ public class MpsSaleOrderIcExtController { @Autowired private IMpsSaleOrderIcExtService extService; + @Autowired + private IPdmProduceWorkorderService workorderService; @PostMapping @Log("新增订单扩展表") @@ -41,6 +44,15 @@ public class MpsSaleOrderIcExtController { @Log("根据工单获取条码") //("根据工单获取条码") public ResponseEntity getExtList(@RequestBody JSONObject whereJson) { + String workorder_code = whereJson.getString("workorder_code"); + MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper() + .eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code"))); + int print_no = 0; + if (one==null){ + + }else { + print_no = one.getPrint_no(); + } return new ResponseEntity<>(extService.list(new QueryWrapper().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java index a286a517..58a98402 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java @@ -112,7 +112,7 @@ public class ISysUserServiceImpl extends ServiceImpl imp @Override @Transactional public void update(Map userDetail) { - if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("userId")==null){ + if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("user_id")==null){ return; } diff --git a/mes/qd/src/views/system/user/center/updatePass.vue b/mes/qd/src/views/system/user/center/updatePass.vue index 9f76cc7b..df1ee2aa 100644 --- a/mes/qd/src/views/system/user/center/updatePass.vue +++ b/mes/qd/src/views/system/user/center/updatePass.vue @@ -43,8 +43,8 @@ export default { { required: true, message: '请输入旧密码', trigger: 'blur' } ], newPass: [ - { required: true, message: '请输入新密码', trigger: 'blur' }, - { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' } + { required: true, message: '请输入新密码', trigger: 'blur' } + // , { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' } ], confirmPass: [ { required: true, validator: confirmPass, trigger: 'blur' } diff --git a/mes/qd/src/views/wms/old_manage/old_package/index.vue b/mes/qd/src/views/wms/old_manage/old_package/index.vue index d53de3fe..ffc02fd1 100644 --- a/mes/qd/src/views/wms/old_manage/old_package/index.vue +++ b/mes/qd/src/views/wms/old_manage/old_package/index.vue @@ -411,8 +411,8 @@ export default { }, query: { workorder_status: '2', - product_area: 'A2', - workprocedure_code: 'A1_BZ', + product_area: 'A3', + workprocedure_code: 'A3_KZBZ', is_error: '0' }, url: 'api/produceWorkorder', diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue index 24c81368..8aab1673 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue @@ -183,7 +183,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + {{ item.label }} + + + + +
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index 4b5aa458..8c86419b 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -479,6 +479,74 @@ clearable /> + + + + + + + + + + + + + + + + + + + + + + + + {{ item.label }} + + + + +
取消 @@ -496,7 +564,6 @@ > -