From 73dd8ac0b7adbde8a13d7799804142f6c7ab991b Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Mon, 28 Jul 2025 17:42:21 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/utils/SecurityUtils.java | 18 ++- .../service/dao/StructattrVechielDto.java | 13 ++ .../mapper/MdPbStoragevehicleextMapper.java | 2 +- .../mapper/MdPbStoragevehicleextMapper.xml | 7 +- .../service/impl/ErpToWmsServiceImpl.java | 7 +- .../wms/pm_manage/service/dao/PmFormData.java | 2 +- .../dao/mapper/xml/PmFormDataMapper.xml | 3 + .../pm_manage/service/dto/FormDataQuery.java | 1 + .../service/IOutBillService.java | 2 +- .../service/dao/GroupPlate.java | 5 + .../service/dao/mapper/IOStorInvMapper.xml | 10 +- .../service/dto/GroupPlateDto.java | 22 +++- .../service/impl/OutBillServiceImpl.java | 117 ++++++++++-------- .../impl/RawAssistIStorServiceImpl.java | 47 +++++-- .../service/util/UpdateIvtUtils.java | 8 +- .../views/wms/pm_manage/form_data/index.vue | 111 +---------------- .../views/wms/pm_manage/form_data2/index.vue | 5 +- .../src/views/wms/st/inbill/AddDialog.vue | 30 ++--- nladmin-ui/src/views/wms/st/inbill/AddDtl.vue | 6 +- .../src/views/wms/st/inbill/DivDialog.vue | 2 +- .../src/views/wms/st/outbill/AddDialog.vue | 10 +- .../src/views/wms/st/outbill/DivDialog.vue | 12 +- .../src/views/wms/st/outbill/StructIvt.vue | 10 +- 23 files changed, 206 insertions(+), 244 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java index 457cee9..842fc98 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/SecurityUtils.java @@ -46,13 +46,11 @@ public class SecurityUtils { * @return 系统用户名称 */ public static String getCurrentNickName() { -// CurrentUser user = getCurrentUser(); -// if (user!=null){ -// return user.getPresonName(); -// } -// return null; - //tofix postMan测试，完成后改回 - return "admin"; + CurrentUser user = getCurrentUser(); + if (user!=null){ + return user.getPresonName(); + } + return "default"; } /** @@ -61,9 +59,7 @@ public class SecurityUtils { * @return 系统用户Id */ public static String getCurrentUserId() { - //return getCurrentUser().getId(); - //tofix postMan测试，完成后改回 - return "1"; + return getCurrentUser().getId(); } /** @@ -72,7 +68,7 @@ public class SecurityUtils { */ @Deprecated public static Long getDeptId() { -// return getCurrentUser().getUser().getDept().getId(); + //return getCurrentUser().getUser().getDept().getId(); return 1L; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java index 0ad847c..6a19c7a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/StructattrVechielDto.java @@ -22,10 +22,23 @@ public class StructattrVechielDto extends GroupPlate { * 仓位编码 */ private String struct_code; + + /** + * 仓位编码 + */ + private String struct_name; + /** + * 库区标识 + */ + private String sect_id; /** * 库区标识 */ private String sect_code; + /** + * 库区标识 + */ + private String sect_name; /** * 仓库标识 */ diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java index 9272ff1..fb8d7cb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.java @@ -87,5 +87,5 @@ public interface MdPbStoragevehicleextMapper extends BaseMapper queryAvailableInv(@Param("params") Map whereJson); + List queryAvailableInv(@Param("params") Map whereJson); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml index 25e9dbf..004abe6 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/MdPbStoragevehicleextMapper.xml @@ -254,7 +254,7 @@ ORDER BY ext.create_time Desc - SELECT ext.group_id as storagevehicleext_id, ext.storagevehicle_code, @@ -277,7 +277,10 @@ INNER JOIN st_ivt_structattr attr ON ext.storagevehicle_code = attr.storagevehicle_code INNER JOIN md_me_materialbase mater ON mater.material_id = ext.material_id - 1 = 1 + attr.lock_type = '0' + AND attr.is_used = "1" + AND ext.status = '02' + and ext.frozen_qty = 0 AND attr.stor_id = #{params.stor_id} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java index 23e2277..4ed1a69 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpToWmsServiceImpl.java @@ -114,7 +114,7 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { jsonDtl.setStatus(IOSEnum.BILL_STATUS.code("生成")); jsonDtl.setStor_id(storDao.getStor_id()); jsonDtl.setStor_name(storDao.getStor_name()); - jsonDtl.setForm_type(json.getString("order_type")); + jsonDtl.setForm_type("0001"); jsonDtl.setSource_form_date(DateUtil.today()); jsonDtl.setMaterial_code(json.getString("mater_code")); jsonDtl.setMaterial_id(materDao.getMaterial_id()); @@ -140,7 +140,8 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { plate.setQty(BigDecimal.valueOf(json.getDoubleValue("qty"))); plate.setStatus(IOSEnum.GROUP_PLATE_STATUS.code("生成")); plate.setExt_code(json.getString("order_code")); - plate.setExt_type(json.getString("order_type")); + plate.setExt_type("0001"); + plate.setExt_id(jsonDtl.getId()); plate.setCreate_name("ERP"); plate.setCreate_time(DateUtil.now()); plates.add(plate); @@ -204,7 +205,7 @@ public class ErpToWmsServiceImpl implements ErpToWmsService { jsonDtl.setStatus(IOSEnum.BILL_STATUS.code("生成")); jsonDtl.setStor_id(storDao.getStor_id()); jsonDtl.setStor_name(storDao.getStor_name()); - jsonDtl.setForm_type(json.getString("order_type")); + jsonDtl.setForm_type("1001"); jsonDtl.setSource_form_date(DateUtil.today()); jsonDtl.setMaterial_code(json.getString("mater_code")); jsonDtl.setMaterial_id(materDao.getMaterial_id()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java index 7fc8425..78d27f3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/PmFormData.java @@ -156,7 +156,7 @@ public class PmFormData implements Serializable { /** * 是否完结 */ - private Integer is_finish; + private String is_finish; /** * 是否合单 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml index 6117b92..2c9cf72 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml @@ -125,6 +125,9 @@ and form_type = #{query.form_type} + + and is_finish = #{query.is_finish} + and pcsn = #{query.pcsn} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java index 4ddf818..c2014fb 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dto/FormDataQuery.java @@ -22,6 +22,7 @@ public class FormDataQuery extends BaseQuery { private String pcsn; private String parent_id; private String material_code; + private String is_finish; private String[] status; private String start_time; private String end_time; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java index 734a1ea..ef6a89b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/IOutBillService.java @@ -116,7 +116,7 @@ public interface IOutBillService extends IService { * @param whereJson * @return */ - List queryAvailableInv(Map whereJson); + List queryAvailableInv(Map whereJson); /** * 出库单手动分配 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java index 0480c31..62ee7aa 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/GroupPlate.java @@ -113,4 +113,9 @@ public class GroupPlate implements Serializable { * 来源单据类型 */ private String ext_type; + + /** + * 来源单据id + */ + private String ext_id; } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml index 768e535..58093de 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/dao/mapper/IOStorInvMapper.xml @@ -54,20 +54,22 @@ gp.material_id, gp.qty_unit_id, gp.qty_unit_name, - gp.qty, + gp.qty as plan_qty, gp.frozen_qty, gp.remark, gp.STATUS, mater.material_name, mater.material_spec, mater.material_code, - gp.ext_code, - gp.ext_type + gp.ext_code as source_bill_code, + gp.ext_type as source_bill_type, + gp.ext_id as source_billdtl_id FROM md_pb_groupplate gp LEFT JOIN md_me_materialbase mater ON mater.material_id = gp.material_id gp.status = '01' and frozen_qty = 0 + and gp.ext_type = '0001' AND gp.material_code LIKE CONCAT('%', #{params.material_code}, '%') @@ -120,7 +122,7 @@