This commit is contained in:
18188916393
2022-08-23 13:42:33 +08:00
parent 84ec044f3d
commit 844b93de98

View File

@@ -52,7 +52,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
log.info("wms同步嘉耐工单失败"); log.info("wms同步嘉耐工单失败");
} }
WQLObject produceTaskTable = WQLObject.getWQLObject("PDM_MG_produceTask"); WQLObject produceTaskTable = WQLObject.getWQLObject("PDM_MG_produceTask");
WQLObject material_table = WQLObject.getWQLObject("md_me_materialbase"); WQLObject material_table = WQLObject.getWQLObject("MD_ME_Material");
WQLObject device_Table = WQLObject.getWQLObject("PDM_BASE_DEVICE"); WQLObject device_Table = WQLObject.getWQLObject("PDM_BASE_DEVICE");
JSONArray dayScheduleArr = result.getJSONObject("returnData").getJSONArray("Table"); JSONArray dayScheduleArr = result.getJSONObject("returnData").getJSONArray("Table");
for (int i = 0; i < dayScheduleArr.size(); i++) { for (int i = 0; i < dayScheduleArr.size(); i++) {
@@ -64,6 +64,10 @@ public class WmsToJnServiceImpl implements WmsToJnService {
//压机编号 //压机编号
String SBDM = dayScheduleObj.getString("SBDM"); String SBDM = dayScheduleObj.getString("SBDM");
JSONObject materialObj = material_table.query("material_code ='" + ITEMCODE + "'").uniqueResult(0); JSONObject materialObj = material_table.query("material_code ='" + ITEMCODE + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(materialObj)){
this.synchroMaterial(new JSONObject());
materialObj = material_table.query("material_code ='" + ITEMCODE + "'").uniqueResult(0);
}
JSONObject deviceObj = device_Table.query("ext_device_code='" + SBDM + "'").uniqueResult(0); JSONObject deviceObj = device_Table.query("ext_device_code='" + SBDM + "'").uniqueResult(0);
JSONObject scheduleObj = produceTaskTable.query("ext_shoporder_no='" + SHOPORDERNO + "'").uniqueResult(0); JSONObject scheduleObj = produceTaskTable.query("ext_shoporder_no='" + SHOPORDERNO + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(scheduleObj)) { if (ObjectUtil.isEmpty(scheduleObj)) {
@@ -85,9 +89,9 @@ public class WmsToJnServiceImpl implements WmsToJnService {
jo.put("print_pc", deviceObj.getString("PRINTPC")); jo.put("print_pc", deviceObj.getString("PRINTPC"));
jo.put("yh_name", deviceObj.getString("YHNAME")); jo.put("yh_name", deviceObj.getString("YHNAME"));
jo.put("is_export", "1"); jo.put("is_export", "1");
jo.put("is_export", deviceObj.getString("STOCKTYPE")); jo.put("vehicle_type", deviceObj.getString("STOCKTYPE"));
jo.put("create_id", SecurityUtils.getCurrentUserId()); jo.put("create_id", "1");
jo.put("create_name", SecurityUtils.getNickName()); jo.put("create_name", "管理员");
jo.put("create_time", DateUtil.now()); jo.put("create_time", DateUtil.now());
produceTaskTable.insert(jo); produceTaskTable.insert(jo);
} }