diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
index fdd68380..bf575e2f 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
@@ -12,9 +12,12 @@ import lombok.extern.slf4j.Slf4j;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.exception.BadRequestException;
+import org.nl.ext.lk.service.impl.WmsToLkServiceImpl;
import org.nl.modules.security.service.dto.JwtUserDto;
+import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
+import org.nl.utils.SpringContextHolder;
import org.nl.wms.basedata.master.constant.MaterOptTypeEnum;
import org.nl.wms.basedata.master.service.MaterialbaseService;
import org.nl.wms.basedata.master.service.dto.MaterialbaseDto;
@@ -546,6 +549,30 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
}
inspectionsheetmstService.confirm(jsonSheeGutDtl);
}
+ /*
+ * 发送质检结果给立库 PG粉
+ */
+ String is_sendLK = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_SENDLK").getValue();
+ if (StrUtil.equals(is_sendLK, "1")) {
+ WmsToLkServiceImpl wmsToLkService = new WmsToLkServiceImpl();
+
+ JSONObject jsonMater = materTab.query("material_id ='" + jsonPhyMst.getString("material_id") + "'").uniqueResult(0);
+
+ JSONObject param = new JSONObject();
+ param.put("material_uuid", jsonMater.getString("ext_id"));
+ param.put("material_id", jsonMater.getString("material_id"));
+ param.put("material_code", jsonMater.getString("material_code"));
+ param.put("material_name", jsonMater.getString("material_name"));
+ param.put("pcsn", jsonPhyMst.getString("pcsn"));
+ param.put("status", jsonPhyMst.getString("result"));
+ param.put("remark", "");
+
+ JSONObject resultJson = wmsToLkService.qualityResult(param);
+
+ if (StrUtil.equals(resultJson.getString("result"), "2")) {
+ throw new BadRequestException("发送立库失败："+resultJson.getString("messsage"));
+ }
+ }
} else if (StrUtil.equals(inspection_type, "10") || StrUtil.equals(inspection_type, "20")) {
// 原料碳化钨、原料钴粉
/*
@@ -956,7 +983,7 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
if (ObjectUtil.isNotEmpty(search_material_code)) map.put("search_material_code",search_material_code+"%");
if (ObjectUtil.isNotEmpty(search_pcsn)) map.put("search_pcsn",search_pcsn+"%");
- JSONObject json = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "biz_date");
+ JSONObject json = WQL.getWO("QL_ERP").addParamMap(map).setDbname("dataSource1").pageQuery(WqlUtil.getHttpContext(page), "biz_date DESC");
return json;
}
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
index 3fc34593..11c01a5a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
@@ -58,6 +58,25 @@
pcsn like 输入.search_pcsn
ENDOPTION
+ ENDSELECT
+ ENDPAGEQUERY
+ ENDIF
+
+ IF 输入.flag = "2"
+ PAGEQUERY
+ SELECT
+ *
+ FROM
+ QL_TEST_PHYSICAL
+
+ OPTION 输入.search_material_code <> ""
+ 'material_code' like 输入.search_material_code
+ ENDOPTION
+
+ OPTION 输入.search_pcsn <> ""
+ 'pcsn' like 输入.search_pcsn
+ ENDOPTION
+
ENDSELECT
ENDPAGEQUERY
ENDIF
\ No newline at end of file
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
index 2d8eb02b..b3d0bc71 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
@@ -57,7 +57,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
@@ -106,7 +107,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceRepairMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
index f6fd57c5..8ed59224 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceRepairPlanMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
index 6faa5013..3e6cc875 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
@@ -51,6 +51,7 @@
class.class_name,
file.device_code,
file.device_name,
+ file.extend_code,
class2.device_faultclass_name
FROM
EM_BI_DeviceRepairRequest mst
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
index f2913873..d7751962 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
@@ -194,6 +194,8 @@
mst.is_delete = '0'
AND (mst.invstatus <> '99' or (mst.invstatus = '99' and mst.audit_time like 输入.today))
+ order by input_time DESC
+
ENDSELECT
ENDQUERY
ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
index 4be0bdb5..574a8e29 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
@@ -101,7 +102,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceMaintenanceMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
index af742cbc..2c77d897 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
@@ -52,7 +52,8 @@
mst.*,
class.class_name,
file.device_code,
- file.device_name
+ file.device_name,
+ file.extend_code
FROM
EM_BI_DeviceMaintenancePlanMst mst
LEFT JOIN EM_BI_EquipmentFile file ON file.devicerecord_id = mst.devicerecord_id
diff --git a/mes/qd/src/views/wms/ql/physicalMstConfirm/PhySyncDialog.vue b/mes/qd/src/views/wms/ql/physicalMstConfirm/PhySyncDialog.vue
index 03f8d5de..f03cbcba 100644
--- a/mes/qd/src/views/wms/ql/physicalMstConfirm/PhySyncDialog.vue
+++ b/mes/qd/src/views/wms/ql/physicalMstConfirm/PhySyncDialog.vue
@@ -81,7 +81,7 @@ export default {
optShow: {},
url: 'api/physicalMst/erpPhyQuery',
idField: 'inspection_id',
- sort: '',
+ sort: 'biz_date DESC',
crudMethod: { ...crudPhysicalMst }
})
},
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue
index 5e5e7e00..1071db00 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepair/index.vue
@@ -97,6 +97,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
index 7fee17a7..eed9392a 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -152,6 +152,7 @@
+
@@ -160,7 +161,7 @@
-
+
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
index 87091fea..e61067b4 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairplan/index.vue
@@ -109,6 +109,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
index 8d627728..a52f09b9 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
@@ -97,6 +97,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
index a375d8ae..66201ba7 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
@@ -123,6 +123,7 @@
+
@@ -131,7 +132,7 @@
-
+
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
index 9aa9fd49..cf91ddd2 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepaorout/index.vue
@@ -108,6 +108,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
index e8013a46..da792788 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenance/index.vue
@@ -108,6 +108,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
index 1f8080ab..f59a93da 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceaudit/index.vue
@@ -97,6 +97,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
index 3d1c71b6..ffa456ad 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenancepa/index.vue
@@ -130,6 +130,7 @@
+
diff --git a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
index c2f0fc17..3b54d5f1 100644
--- a/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
+++ b/mes/qd/src/views/wms/sb/upkeep/devicemaintenanceplan/index.vue
@@ -106,17 +106,18 @@
-
-
-
+
+
+
+
-
+
-
+