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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-07-22 15:44:26 +08:00
parent e2ddfbd1b8
commit a5e8da505f
4 changed files with 137 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/service/impl/WmsToErpServiceImpl.java
View File

@@ -389,11 +389,11 @@ public class WmsToErpServiceImpl implements WmsToErpService {
HashMap<String, String> whereMap = new HashMap<String, String>(); HashMap<String, String> whereMap = new HashMap<String, String>();
if (map == null) { if (map == null) {
//查询日期 //查询日期
String import_date = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_IMPORT_DATE").getValue(); String import_date = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_SPARE_DATE").getValue();
whereMap.put("import_date4", import_date); whereMap.put("import_date4", import_date);
//更新日期 //更新日期
SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_IN_IMPORT_DATE").setValue(DateUtil.now()); SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_SPARE_DATE").setValue(DateUtil.now());
ParamDto purchase_import_date = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_IN_IMPORT_DATE"); ParamDto purchase_import_date = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("PURCHASE_SPARE_DATE");
purchase_import_date.setValue(DateUtil.now()); purchase_import_date.setValue(DateUtil.now());
SpringContextHolder.getBean(ParamServiceImpl.class).update(purchase_import_date); SpringContextHolder.getBean(ParamServiceImpl.class).update(purchase_import_date);
} else { } else {
@@ -459,7 +459,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
io_mst.put("stor_id", stor_jo.getString("stor_id")); io_mst.put("stor_id", stor_jo.getString("stor_id"));
io_mst.put("stor_code", stor_jo.getString("stor_code")); io_mst.put("stor_code", stor_jo.getString("stor_code"));
io_mst.put("stor_name", stor_jo.getString("stor_name")); io_mst.put("stor_name", stor_jo.getString("stor_name"));
io_mst.put("total_qty", purchase.getString("qty")); io_mst.put("total_qty", purchase.getString("QTY"));
io_mst.put("detail_count", "1"); io_mst.put("detail_count", "1");
io_mst.put("bill_status", "10"); io_mst.put("bill_status", "10");
io_mst.put("create_mode", "01"); io_mst.put("create_mode", "01");
@@ -492,15 +492,15 @@ public class WmsToErpServiceImpl implements WmsToErpService {
JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '" + purchase.getString("UNIT") + "'").uniqueResult(0); JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '" + purchase.getString("UNIT") + "'").uniqueResult(0);
io_dtl.put("qty_unit_id", qty_jo.getString("measure_unit_id")); io_dtl.put("qty_unit_id", qty_jo.getString("measure_unit_id"));
io_dtl.put("qty_unit_name", qty_jo.getString("unit_name")); io_dtl.put("qty_unit_name", qty_jo.getString("unit_name"));
io_dtl.put("plan_qty",purchase.getString("qty")); io_dtl.put("plan_qty", purchase.getString("QTY"));
io_dtl.put("source_billdtl_id", purchase.getString("id")); io_dtl.put("source_billdtl_id", purchase.getString("id"));
io_dtl.put("source_bill_type",purchase.getString("PO")); io_dtl.put("source_bill_type", "PO");
io_dtl.put("source_bill_code", purchase.getString("VBILLCODE")); io_dtl.put("source_bill_code", purchase.getString("VBILLCODE"));
io_dtl.put("source_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); io_dtl.put("source_bill_table", "EM_BI_ErpPurchaseIn");
io_dtl.put("base_billdtl_id", purchase.getString("id")); io_dtl.put("base_billdtl_id", purchase.getString("id"));
io_dtl.put("base_bill_type",purchase.getString("PO")); io_dtl.put("base_bill_type", "PO");
io_dtl.put("base_bill_code", purchase.getString("VBILLCODE")); io_dtl.put("base_bill_code", purchase.getString("VBILLCODE"));
io_dtl.put("base_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); io_dtl.put("base_bill_table", "EM_BI_ErpPurchaseIn");
io_dtl.put("remark_ext", purchase.getString("CGENERALHID")); io_dtl.put("remark_ext", purchase.getString("CGENERALHID"));
WQLObject.getWQLObject("EM_BI_IOStorInvDtl").insert(io_dtl); WQLObject.getWQLObject("EM_BI_IOStorInvDtl").insert(io_dtl);
} }
@@ -557,7 +557,7 @@ public class WmsToErpServiceImpl implements WmsToErpService {
io_mst.put("stor_id", stor_jo.getString("stor_id")); io_mst.put("stor_id", stor_jo.getString("stor_id"));
io_mst.put("stor_code", stor_jo.getString("stor_code")); io_mst.put("stor_code", stor_jo.getString("stor_code"));
io_mst.put("stor_name", stor_jo.getString("stor_name")); io_mst.put("stor_name", stor_jo.getString("stor_name"));
io_mst.put("total_qty", purchase.getString("qty")); io_mst.put("total_qty", purchase.getString("QTY"));
io_mst.put("detail_count", "1"); io_mst.put("detail_count", "1");
io_mst.put("bill_status", "10"); io_mst.put("bill_status", "10");
io_mst.put("create_mode", "01"); io_mst.put("create_mode", "01");
@@ -590,15 +590,15 @@ public class WmsToErpServiceImpl implements WmsToErpService {
JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '" + purchase.getString("UNIT") + "'").uniqueResult(0); JSONObject qty_jo = WQLObject.getWQLObject("md_pb_measureunit").query("ext_id = '" + purchase.getString("UNIT") + "'").uniqueResult(0);
io_dtl.put("qty_unit_id", qty_jo.getString("measure_unit_id")); io_dtl.put("qty_unit_id", qty_jo.getString("measure_unit_id"));
io_dtl.put("qty_unit_name", qty_jo.getString("unit_name")); io_dtl.put("qty_unit_name", qty_jo.getString("unit_name"));
io_dtl.put("plan_qty",purchase.getString("qty")); io_dtl.put("plan_qty", purchase.getString("QTY"));
io_dtl.put("source_billdtl_id", purchase.getString("id")); io_dtl.put("source_billdtl_id", purchase.getString("id"));
io_dtl.put("source_bill_type",purchase.getString("PO")); io_dtl.put("source_bill_type", "PO");
io_dtl.put("source_bill_code", purchase.getString("VBILLCODE")); io_dtl.put("source_bill_code", purchase.getString("VBILLCODE"));
io_dtl.put("source_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); io_dtl.put("source_bill_table", "EM_BI_ErpPurchaseIn");
io_dtl.put("base_billdtl_id", purchase.getString("id")); io_dtl.put("base_billdtl_id", purchase.getString("id"));
io_dtl.put("base_bill_type",purchase.getString("PO")); io_dtl.put("base_bill_type", "PO");
io_dtl.put("base_bill_code", purchase.getString("VBILLCODE")); io_dtl.put("base_bill_code", purchase.getString("VBILLCODE"));
io_dtl.put("base_bill_table",purchase.getString("EM_BI_ErpPurchaseIn")); io_dtl.put("base_bill_table", "EM_BI_ErpPurchaseIn");
io_dtl.put("remark_ext", purchase.getString("CGENERALHID")); io_dtl.put("remark_ext", purchase.getString("CGENERALHID"));
WQLObject.getWQLObject("EM_BI_IOStorInvDtl").insert(io_dtl); WQLObject.getWQLObject("EM_BI_IOStorInvDtl").insert(io_dtl);
} }

3
mes/hd/nladmin-system/src/main/java/org/nl/ext/erp/wql/QERP.wql
View File

@@ -19,6 +19,7 @@
输入.import_date1 TYPEAS s_string 输入.import_date1 TYPEAS s_string
输入.import_date2 TYPEAS s_string 输入.import_date2 TYPEAS s_string
输入.import_date3 TYPEAS s_string 输入.import_date3 TYPEAS s_string
输入.import_date4 TYPEAS s_string
输入.begin_time TYPEAS s_string 输入.begin_time TYPEAS s_string
输入.end_time TYPEAS s_string 输入.end_time TYPEAS s_string
输入.fbillflag TYPEAS s_string 输入.fbillflag TYPEAS s_string
@@ -135,7 +136,7 @@
PURCHASE_IN pp PURCHASE_IN pp
WHERE 1=1 WHERE 1=1
OPTION 输入.import_date4 <> "" OPTION 输入.import_date4 <> ""
pp.CREATIONTIME > to_date(输入.import_date3,'yyyy-mm-dd HH24:MI:SS') pp.CREATIONTIME > to_date(输入.import_date4,'yyyy-mm-dd HH24:MI:SS')
ENDOPTION ENDOPTION
OPTION 输入.begin_time <> "" OPTION 输入.begin_time <> ""
pp.CREATIONTIME >= to_date(输入.begin_time,'yyyy-mm-dd HH24:MI:SS') pp.CREATIONTIME >= to_date(输入.begin_time,'yyyy-mm-dd HH24:MI:SS')

10
mes/hd/nladmin-system/src/main/java/org/nl/pda/pdm/service/impl/PdmWorkTaskServiceImpl.java
View File

@@ -1326,6 +1326,15 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
throw new PdaRequestException("未查询到生产中的配方明细！"); throw new PdaRequestException("未查询到生产中的配方明细！");
} }
//查询对应的工序任务
JSONObject work_task = WQLObject.getWQLObject("pdm_bi_worktask").query("workorder_code = '"+from_jo.getString("workorder_code")+"' AND workprocedure_code = 'GX001'").uniqueResult(0);
if (ObjectUtil.isEmpty(work_task)){
throw new PdaRequestException("未查询到对应的工序任务！");
}
JSONObject device_jo = WQLObject.getWQLObject("em_bi_deviceinfo").query("device_id = '"+work_task.getString("device_id")+"'").uniqueResult(0);
if (ObjectUtil.isEmpty(device_jo)){
throw new PdaRequestException("当前工序未绑定设备！");
}
JSONObject bucket_job = WQLObject.getWQLObject("PDM_BI_FormulaDtlJob").query("status < '99' AND formula_code = '" + formula_code + "'").uniqueResult(0); JSONObject bucket_job = WQLObject.getWQLObject("PDM_BI_FormulaDtlJob").query("status < '99' AND formula_code = '" + formula_code + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(bucket_job)) { if (ObjectUtil.isNotEmpty(bucket_job)) {
throw new PdaRequestException("桶存在未完成的作业！"); throw new PdaRequestException("桶存在未完成的作业！");
@@ -1403,6 +1412,7 @@ public class PdmWorkTaskServiceImpl implements PdmWorkTaskService {
flag = "3"; flag = "3";
} }
bucket_jo.put("flag", flag); bucket_jo.put("flag", flag);
bucket_jo.put("device_code", device_jo.getString("device_code"));
bucket_jo.put("formuladtl_id", dtl_jo.getString("formuladtl_id")); bucket_jo.put("formuladtl_id", dtl_jo.getString("formuladtl_id"));
bucket_jo.put("formula_id", dtl_jo.getString("formula_id")); bucket_jo.put("formula_id", dtl_jo.getString("formula_id"));
bucket_jo.put("formula_code", dtl_jo.getString("formula_code")); bucket_jo.put("formula_code", dtl_jo.getString("formula_code"));

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

@@ -179,6 +179,7 @@
( (
case when base_bill_type = '010901' then '领用出库' case when base_bill_type = '010901' then '领用出库'
when base_bill_type IN ('01','02') then '维修单' when base_bill_type IN ('01','02') then '维修单'
when base_bill_type = 'PO' then '备件采购订单'
else '' else ''
end end
) AS source_bill_type_name, ) AS source_bill_type_name,