From b833fb07bf808f5c59b0ef491783cc6bab30f46b Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Sun, 4 Dec 2022 15:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crm/service/impl/CrmToLmsServiceImpl.java | 12 +++++++++ .../mes/service/impl/MesToLmsServiceImpl.java | 25 ++++++++++++++++-- .../main/java/org/nl/wms/ext/wql/QCRM_001.wql | 12 +++++++++ .../bi/service/dto/SubpackagerelationDto.java | 6 +++++ .../src/main/java/org/nl/wms/pdm/wql/pdm.xls | Bin 249856 -> 250880 bytes .../st/returns/wql/QST_IVT_INANDOUTRETRUN.wql | 7 ++--- lms/nladmin-ui/src/views/wms/pdm/bi/index.vue | 19 +++++++++++-- .../views/wms/st/inStor/change/AddDialog.vue | 2 +- .../wms/statistics/ioStorQuery/index.vue | 11 ++++---- 9 files changed, 79 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java index 1887f1922..50d21d844 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/crm/service/impl/CrmToLmsServiceImpl.java @@ -105,6 +105,9 @@ public class CrmToLmsServiceImpl implements CrmToLmsService { String customername = jo.getString("customername"); String customerdescription = jo.getString("customerdescription"); String width = jo.getString("width"); + String struct_code = jo.getString("struct_code"); + String dateoffginbound = jo.getString("dateoffginbound"); + String packageboxsn = jo.getString("packageboxsn"); HashMap map = new HashMap<>(); if (StrUtil.isNotEmpty(material_code)) { @@ -134,6 +137,15 @@ public class CrmToLmsServiceImpl implements CrmToLmsService { if (StrUtil.isNotEmpty(width)) { map.put("width", width); } + if (StrUtil.isNotEmpty(packageboxsn)) { + map.put("packageboxsn", packageboxsn); + } + if (StrUtil.isNotEmpty(dateoffginbound)) { + map.put("dateoffginbound", dateoffginbound); + } + if (StrUtil.isNotEmpty(struct_code)) { + map.put("struct_code", struct_code); + } //将查询条件带入，查询LMS成品库库存信息 JSONArray rows = WQL.getWO("QCRM_001").addParamMap(map).addParam("flag", "1").process().getResultJSONArray(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 410d8fc66..9aae10810 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -25,7 +25,9 @@ import org.nl.wms.sch.manage.AbstractAcsTask; import org.nl.wms.sch.tasks.CoolCutTask; import org.nl.wms.st.inbill.service.CheckOutBillService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.HashMap; @Service @@ -54,6 +56,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject momRollFoilStart(JSONObject param) { log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString()); @@ -135,6 +138,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject momRollFoilWeighing(JSONObject param) { log.info("momRollFoilStart接口输入参数为：-------------------" + param.toString()); @@ -183,6 +187,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject momRollFoilComplete(JSONObject param) { log.info("momRollFoilComplete接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); @@ -242,6 +247,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject momRollBakeNextSpecTransfer(JSONObject param) { log.info("momRollBakeNextSpecTransfer接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); @@ -327,6 +333,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject cutPlanTransfer(JSONObject param) { log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString()); @@ -450,6 +457,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject callNextAssAndMomRoll(JSONObject param) { log.info("callNextAssAndMomRoll接口输入参数为：-------------------" + param.toString()); @@ -636,6 +644,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject childRollCutStartComp(JSONArray param) { log.info("childRollCutStartComp接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); @@ -723,6 +732,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject childRollPackComplete(JSONObject param) { log.info("childRollPackComplete接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); @@ -732,7 +742,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { // if (StrUtil.equals(is_mesTolms, "1")) { String isUnPlanProductionBox = param.getString("isUnPlanProductionBox"); // 生产订单 String QuanlityInBox = param.getString("QuanlityInBox"); // 产品编码 - String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 分切机台编码 + String QualityGuaranPeriod = param.getString("QualityGuaranPeriod"); // 保质期 String ProductName = param.getString("ProductName"); // 来源卷位置 String Description = param.getString("Description"); // 来源卷位置 String DateOfFGInbound = param.getString("DateOfFGInbound"); // 来源卷位置 @@ -765,6 +775,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { String UnPlanProductProperty2 = detail.getString("UnPlanProductProperty2"); String UnPlanProductProperty3 = detail.getString("UnPlanProductProperty3"); String sap_pcsn = detail.getString("Attribute1");//SAP批次 + String thickness_request = detail.getString("Attribute2");//物料主数据厚度 + String width_standard = detail.getString("Attribute3");//要求幅宽 JSONObject jo = new JSONObject(); jo.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -776,7 +788,12 @@ public class MesToLmsServiceImpl implements MesToLmsService { jo.put("box_high", box_high); jo.put("quanlity_in_box", QuanlityInBox); // jo.put("box_weight", BoxWeight); - jo.put("quality_guaran_period", QualityGuaranPeriod); + if (QualityGuaranPeriod.equals("0天")){ + jo.put("quality_guaran_period", "90天"); + }else { + jo.put("quality_guaran_period", QualityGuaranPeriod); + } + jo.put("sale_order_name", SaleOrderName); jo.put("customer_name", CustomerName); jo.put("customer_description", CustomerDescription); @@ -794,6 +811,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { jo.put("un_plan_product_property1", UnPlanProductProperty1); jo.put("un_plan_product_property2", UnPlanProductProperty2); jo.put("un_plan_product_property3", UnPlanProductProperty3); + jo.put("width_standard",width_standard); + jo.put("thickness_request",thickness_request); jo.put("status", "0"); jo.put("create_id", "1"); jo.put("create_name", "管理员"); @@ -829,6 +848,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject inventoryTransferInfoSync(JSONObject param) { log.info("inventoryTransferInfoSync接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); @@ -942,6 +962,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { */ @LokiLog(type = LokiLogType.MES_TO_LMS) @Override + @Transactional(rollbackFor = Exception.class) public JSONObject childRollInfoUpdate(JSONObject param) { log.info("childRollInfoUpdate接口输入参数为：-------------------" + param.toString()); JSONObject result = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql index 87c6b3117..8ae533733 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql @@ -18,6 +18,9 @@ 输入.material_name TYPEAS s_string 输入.mfgordername TYPEAS f_string 输入.customername TYPEAS s_string + 输入.packageboxsn TYPEAS s_string + 输入.dateoffginbound TYPEAS s_string + 输入.struct_code TYPEAS s_string 输入.customerdescription TYPEAS s_string 输入.width TYPEAS f_string @@ -85,6 +88,15 @@ ENDOPTION OPTION 输入.width <> "" sub.width >= 输入.width + ENDOPTION + OPTION 输入.struct_code <> "" + stor.ext_id = 输入.struct_code + ENDOPTION + OPTION 输入.dateoffginbound <> "" + sub.date_of_FG_inbound = 输入.dateoffginbound + ENDOPTION + OPTION 输入.packageboxsn <> "" + sub.package_box_sn = 输入.packageboxsn ENDOPTION ENDSELECT ENDQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java index 82b6e2c65..eaa88c94b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/dto/SubpackagerelationDto.java @@ -117,4 +117,10 @@ public class SubpackagerelationDto implements Serializable { /** 高 */ private String box_high; + + /** 物料主数据厚度 */ + private String thickness_request; + + /** 要求幅宽 */ + private String width_standard; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index fce03bb21073b18639d71f7a8a9a454d2420bac6..ec9cf12ec455946437b83620d5a64fec08784a6e 100644 GIT binary patch delta 14977 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 delta 14594 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 V83$qa<%j8V{JW{*Fg?ri{{S~UFP{Ja diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index 219f0eee3..cc7bbf6c0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -109,13 +109,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.biz_date >= 输入.begin_time + mst.input_time >= 输入.begin_time ENDOPTION - OPTION 输入.end_time <> "" - mst.biz_date <= 输入.end_time + mst.input_time <= 输入.end_time ENDOPTION - OPTION 输入.material_search <> "" ( mb.material_code like 输入.material_search @@ -123,7 +121,6 @@ mb.material_name like 输入.material_search ) ENDOPTION - ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue index bda6e6629..2c2caa522 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue @@ -338,6 +338,18 @@ + + + + + + + + + + + + @@ -405,7 +417,7 @@ - +