diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java index ae99387ee..aaa56aa74 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/TransportationbaseServiceImpl.java @@ -49,7 +49,7 @@ public class TransportationbaseServiceImpl implements TransportationbaseService if (ObjectUtil.isNotEmpty(cust_name)) { map.put("cust_name", "%" + cust_name + "%"); } - JSONObject json = WQL.getWO("QMD_CS_TRANSPORAIONL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time ASC"); + JSONObject json = WQL.getWO("QMD_CS_TRANSPORAIONL").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC ,update_time ASC"); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java index f8ed1f39d..a1babf2f7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/MdmToLmsService.java @@ -8,9 +8,16 @@ import java.util.List; public interface MdmToLmsService { + /** + * MDM客户接口 + */ CommonResponseDto transCustomerInfo(JSONObject jsonData); - + /** + * MDM供应商接口 + */ CommonResponseDto transSupplierInfo(JSONObject jsonData); - + /** + * MDM物料主数据接口 + */ CommonResponseDto transMaterialInfo(JSONObject jsonData); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java index 0188ad9fe..723f1fbdc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mdm/service/impl/MdmToLmsServiceImpl.java @@ -99,7 +99,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { customer_jo.put("mdm_status", customerStatus); customer_jo.put("sales_owner", sales_owner); customer_jo.put("create_id", currentUserId); - customer_jo.put("create_name", "mdmAdmin"); + customer_jo.put("create_name", "mdm_user"); customer_jo.put("create_time", now); WQLObject.getWQLObject("md_cs_customerbase").insert(customer_jo); ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage()); @@ -109,7 +109,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { customer_jo.put("cust_simple_name", abbreviation); customer_jo.put("sales_owner", sales_owner); customer_jo.put("update_optid", currentUserId); - customer_jo.put("update_optname", "mdmAdmin"); + customer_jo.put("update_optname", "mdm_user"); customer_jo.put("mdm_status", customerStatus); customer_jo.put("update_time", now); WQLObject.getWQLObject("md_cs_customerbase").update(customer_jo); @@ -179,7 +179,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { supplier_jo.put("cust_simple_name", abbreviation); supplier_jo.put("mdm_status", gfSupplierStatus); supplier_jo.put("create_id", currentUserId); - supplier_jo.put("create_name", "mdmAdmin"); + supplier_jo.put("create_name", "mdm_user"); supplier_jo.put("create_time", now); WQLObject.getWQLObject("md_cs_transportationbase").insert(supplier_jo); ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage()); @@ -188,7 +188,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { supplier_jo.put("cust_name", supplierName); supplier_jo.put("cust_simple_name", abbreviation); supplier_jo.put("update_optid", currentUserId); - supplier_jo.put("update_optname", "mdmAdmin"); + supplier_jo.put("update_optname", "mdm_user"); supplier_jo.put("mdm_status", gfSupplierStatus); supplier_jo.put("update_time", now); WQLObject.getWQLObject("md_cs_transportationbase").update(supplier_jo); @@ -248,7 +248,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { } JSONObject material_jo = WQLObject.getWQLObject("md_me_materialbase").query("material_code = '" + mdCode + "'").uniqueResult(0); if (ObjectUtil.isEmpty(material_jo)) { - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "'").uniqueResult(0); + JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("MDM->未查询到相关计量单位，请进行维护！"); } @@ -258,14 +258,15 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { material_jo.put("material_name", mdDescription); material_jo.put("base_unit_id", unit.getString("measure_unit_id")); material_jo.put("mdm_status", mstae); + material_jo.put("is_used", "1"); material_jo.put("create_id", currentUserId); - material_jo.put("create_name", "mdmAdmin"); + material_jo.put("create_name", "mdm_user"); material_jo.put("create_time", now); WQLObject.getWQLObject("md_me_materialbase").insert(material_jo); ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage()); responseItemsData.add(itemsData); } else { - JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "'").uniqueResult(0); + JSONObject unit = WQLObject.getWQLObject("md_pb_measureunit").query("unit_code = '" + meins + "' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(unit)) { throw new BadRequestException("MDM->未查询到相关计量单位，请进行维护！"); } @@ -273,7 +274,7 @@ public class MdmToLmsServiceImpl implements MdmToLmsService { material_jo.put("base_unit_id", unit.getString("measure_unit_id")); material_jo.put("mdm_status", mstae); material_jo.put("update_optid", currentUserId); - material_jo.put("update_optname", "mdmAdmin"); + material_jo.put("update_optname", "mdm_user"); material_jo.put("update_time", now); WQLObject.getWQLObject("md_me_materialbase").update(material_jo); ResponseItemsData itemsData = ResponseItemsData.adapter(mdId, mdCode, mdDescription, StatusEnum.ACCEPT_SUCCESS.getCode(), StatusEnum.ACCEPT_SUCCESS.getMessage()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java index 0a937176c..b2ac71814 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/LmsToSapServiceImpl.java @@ -52,7 +52,7 @@ public class LmsToSapServiceImpl implements LmsToSapService { String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue(); String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue(); String api = ""; - url = url + "/sap/center/wms/004"; + url = url + "/sap/center/lms/004"; try { String resultMsg = HttpRequest.post(url).header("TOKEN", token) .header("sap-client", sap_client) @@ -113,7 +113,7 @@ public class LmsToSapServiceImpl implements LmsToSapService { String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue(); String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue(); String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue(); - String api = "/sap/center/wms/005"; + String api = "/sap/center/lms/005"; url = url + api; try { String resultMsg = HttpRequest.post(url).header("TOKEN", token) @@ -154,7 +154,7 @@ public class LmsToSapServiceImpl implements LmsToSapService { String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_URL").getValue(); String token = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_TOKEN").getValue(); String sap_client = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("SAP_CLIENT").getValue(); - String api = "/sap/center/wms/007"; + String api = "/sap/center/lms/007"; url = url + api; try { String resultMsg = HttpRequest.post(url).header("TOKEN", token) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 15d400b8e..33fd00387 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -678,7 +678,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } // 销售出库 - if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011")) { + if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") || StrUtil.equals(bill_type, "1013") || StrUtil.equals(bill_type, "1014") || StrUtil.equals(bill_type, "1015")) { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); @@ -783,7 +783,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { paramDis.put("ZZWLHD", jsonSub.getString("thickness")); paramDis.put("CHARG", jsonSub.getString("sap_pcsn")); paramDis.put("KALAB", NumberUtil.round(jsonDis.getDoubleValue("plan_qty"), 3)); - paramDis.put("WERKS", "2460"); + paramDis.put("WERKS", "2461"); paramSapMstArr.add(paramDis); } param.put("ITEM", paramSapMstArr); @@ -1308,7 +1308,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } // 销售出库 - if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") ) { + if (StrUtil.equals(bill_type, "1001") || StrUtil.equals(bill_type, "1011") || StrUtil.equals(bill_type, "1013") || StrUtil.equals(bill_type, "1014") || StrUtil.equals(bill_type, "1015")) { // 1.回传sap JSONArray paramSapMstArr = new JSONArray(); diff --git a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue index 9530eace0..7400a1435 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue @@ -105,7 +105,7 @@ - + @@ -193,10 +193,10 @@ - + - - + + + - + + + @@ -261,7 +262,7 @@ const defaultForm = { remark: null } export default { - dicts: ['is_used'], + dicts: ['is_used', 'TRANSPORTATIONBASE_MDM_STATUS'], name: 'Transportationbase', components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], @@ -329,6 +330,9 @@ export default { data.is_used = '0' } }) + }, + mdmStatusTrans(row) { + return this.dict.label.TRANSPORTATIONBASE_MDM_STATUS[row.mdm_status] } } }