root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
liuxy
2022-09-05 11:26:53 +08:00
parent d6a253c55e
commit ab4f712f48
19 changed files with 80 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
View File

@@ -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;
}

19
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
View File

@@ -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

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
View File

@@ -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

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRPLAN001.wql
View File

@@ -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

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
View File

@@ -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

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/stat/wql/TASK_AUTOWEBSOCKETTSK.wql
View File

@@ -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

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCE001.wql
View File

@@ -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

3
mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/upkeep/wql/EM_BIDEVICEMAINTENANCEPLAN001.wql
View File

@@ -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