diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/ErpInOutBoundOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/ErpInOutBoundOrder.java index ccd9dbd..5e41786 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/ErpInOutBoundOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/ErpInOutBoundOrder.java @@ -17,7 +17,7 @@ public class ErpInOutBoundOrder { //单据类型.单据类型 入库 11T1 出库 11T2 @Alias("DOC_ID_DOC_CODE") private String DOC_ID_DOC_CODE; - //单据类型.组织类型.工厂/储运.工厂/储运编号 B0801 + //单据类型.组织类型.工厂/储运.工厂/储运编号 B0504 @Alias("DOC_ID_Owner_Org_PLANT_PLANT_CODE") private String DOC_ID_Owner_Org_PLANT_PLANT_CODE; //单据日期 @@ -29,7 +29,7 @@ public class ErpInOutBoundOrder { //关联员工.员工编号 @Alias("Owner_Emp_EMPLOYEE_CODE") private String Owner_Emp_EMPLOYEE_CODE; - //组织类型.工厂/储运.工厂/储运编号 B0801 + //组织类型.工厂/储运.工厂/储运编号 B0504 @Alias("Owner_Org_PLANT_PLANT_CODE") private String Owner_Org_PLANT_PLANT_CODE; //单据状态属性 N diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 188e41d..4e59eb5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -131,14 +131,14 @@ public class ToErpServiceImpl implements IToErpService { } erpInOutBoundOrder.setDOC_NO(docNo); erpInOutBoundOrder.setDOC_ID_DOC_CODE(docIdDocCode); - erpInOutBoundOrder.setDOC_ID_Owner_Org_PLANT_PLANT_CODE("B0801"); + erpInOutBoundOrder.setDOC_ID_Owner_Org_PLANT_PLANT_CODE("B0504"); erpInOutBoundOrder.setDOC_DATE(DateUtil.formatDateTime(new Date())); erpInOutBoundOrder.setTRANSACTION_DATE(DateUtil.formatDateTime(new Date())); erpInOutBoundOrder.setOwner_Emp_EMPLOYEE_CODE("E11173"); - erpInOutBoundOrder.setOwner_Org_PLANT_PLANT_CODE("B0801"); + erpInOutBoundOrder.setOwner_Org_PLANT_PLANT_CODE("B0504"); erpInOutBoundOrder.setApproveStatus("N"); erpInOutBoundOrder.setCATEGORY("11"); - erpInOutBoundOrder.setCOMPANY_ID_COMPANY_CODE("B08"); + erpInOutBoundOrder.setCOMPANY_ID_COMPANY_CODE("B05"); erpInOutBoundOrder.setOwner_Dept_ADMIN_UNIT_CODE("HM01F"); erpInOutBoundOrder.setSTOCK_ACTION(1); //List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByJobId(transferBillCallback.getJobId()); @@ -150,7 +150,7 @@ public class ToErpServiceImpl implements IToErpService { erpTransactionDocD.setITEM_SPECIFICATION(transferBillCallback.getSpare3()); erpTransactionDocD.setBUSINESS_QTY(1.0); erpTransactionDocD.setWAREHOUSE_ID_WAREHOUSE_CODE("H041-1"); - erpTransactionDocD.setWAREHOUSE_ID_Owner_Org_PLANT_PLANT_CODE("B0801"); + erpTransactionDocD.setWAREHOUSE_ID_Owner_Org_PLANT_PLANT_CODE("B0504"); erpTransactionDocD.setBUSINESS_UNIT_ID_UNIT_CODE("TAI"); erpTransactionDocD.setGENERATE_SOURCE(""); erpTransactionDocDS.add(erpTransactionDocD); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 45f0dfc..0b291d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -112,7 +112,8 @@ public class ToWmsServiceImpl implements IToWmsService { String ph = findFirst(PATTERNS.get("PH"), trayCode); String nw = findFirst(PATTERNS.get("NW"), trayCode); String gw = findFirst(PATTERNS.get("GW"), trayCode);; - String productId = findFirst(PATTERNS.get("ITEM_CODE"), trayCode); +// String productId = findFirst(PATTERNS.get("ITEM_CODE"), trayCode); + String productId = "KC01001000145"; String bm = findFirst(PATTERNS.get("@"), trayCode); bm=bm.substring(0,bm.length()-1); String[] decode = ProcodeUtils.decode(bm); @@ -263,13 +264,13 @@ public class ToWmsServiceImpl implements IToWmsService { } //todo 创建工艺入库单 - if ("2".equals(requestEnter.getFloor())){ - AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill); - if (!workshopInboundOrder.isSuccess()){ - //throw new RuntimeException("创建工单失败"); - return new AjaxResult(9, "创建工艺入库单失败！"); - } - } +// if ("2".equals(requestEnter.getFloor())){ +// AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill); +// if (!workshopInboundOrder.isSuccess()){ +// //throw new RuntimeException("创建工单失败"); +// return new AjaxResult(9, "创建工艺入库单失败！"); +// } +// } //修改作业状态为正执行 result.put("jobId", mydoJob.getJobId()); @@ -340,6 +341,7 @@ public class ToWmsServiceImpl implements IToWmsService { result.put("entranceId", mydoJob.getEntranceId()); result.put("flag", mydoJob.getWorkshopId()); result.put("traySize", mydoJob.getDepartmentId()); + result.put("inOrOut", mydoJob.getInOrOut()); mydoJob.setStatus("3"); mydoJob.setStartTime(DateUtil.formatDateTime(new Date())); mydoJobService.updateMydoJob(mydoJob); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index a4d28a9..5314524 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -363,7 +363,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } transferBillCallback.setSpare3(mydoJobDetails.get(0).getSpec()); transferBillCallback.setTrayCode(mydoJob.getTrayCode()); - transferBillCallbackService.insertTransferBillCallback(transferBillCallback); + //transferBillCallbackService.insertTransferBillCallback(transferBillCallback); return AjaxResult.success(); } else { return AjaxResult.warn("不存在子作业"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java index 03b03ac..fedd4d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java @@ -197,9 +197,9 @@ public class HttpUtils log.info("sendPost - {}", url); URL realUrl = new URL(url); URLConnection conn = realUrl.openConnection(); - conn.setRequestProperty("digi-key", "096DCF2A5F017943A41BB9F1F3AFE702"); + conn.setRequestProperty("digi-key", "B885545D2971B2ABA36458B3D1C2BD7C"); conn.setRequestProperty("digi-host", "{\"ver\":\"5.7\",\"prod\":\"YLTK\",\"timezone\":\"+8\",\"ip\":\"192.168.116.1\",\"id\":\"\",\"lang\":\"zh_CN\",\"acct\":\"dcms\",\"timestamp\":\"2018071990007275\"}"); - conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.wip_transfer_doc.create\",\"id\":\"BY_External\"}"); + conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.wip_transfer_doc.create\",\"id\":\"E10_BLS_ZS_External\"}"); conn.setRequestProperty("digi-data-exchange-protocol", "1.0"); conn.setRequestProperty("digi-type", "sync"); conn.setRequestProperty("Content-Type", contentType); @@ -270,9 +270,9 @@ public class HttpUtils log.info("sendPost - {}", url); URL realUrl = new URL(url); URLConnection conn = realUrl.openConnection(); - conn.setRequestProperty("digi-key", "8462368FDC41FF7AA846DDDAF283D52E"); + conn.setRequestProperty("digi-key", "A165BA69C60D9CEB8E55D8B4B5EDACEC"); conn.setRequestProperty("digi-host", "{\"ver\":\"5.7\",\"prod\":\"YLTK\",\"timezone\":\"+8\",\"ip\":\"192.168.116.1\",\"id\":\"\",\"lang\":\"zh_CN\",\"acct\":\"dcms\",\"timestamp\":\"2018071990007275\"}"); - conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.transaction_doc.create\",\"id\":\"BY_External\"}"); + conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.transaction_doc.create\",\"id\":\"E10_BLS_ZS_External\"}"); conn.setRequestProperty("digi-data-exchange-protocol", "1.0"); conn.setRequestProperty("digi-type", "sync"); conn.setRequestProperty("Content-Type", contentType); @@ -395,9 +395,9 @@ public class HttpUtils log.info("sendPost - {}", url); URL realUrl = new URL(url); URLConnection conn = realUrl.openConnection(); - conn.setRequestProperty("digi-key", "3F0C850C272C49596DEDDA1DF5070E0D"); + conn.setRequestProperty("digi-key", "EB8FDF33F7D2BF81D8B56F10373880BB"); conn.setRequestProperty("digi-host", "{\"ver\":\"5.7\",\"prod\":\"YLTK\",\"timezone\":\"+8\",\"ip\":\"192.168.116.1\",\"id\":\"\",\"lang\":\"zh_CN\",\"acct\":\"dcms\",\"timestamp\":\"2018071990007275\"}"); - conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.mo.query\",\"id\":\"BY_External\"}"); + conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.mo.query\",\"id\":\"E10_BLS_ZS_External\"}"); conn.setRequestProperty("digi-data-exchange-protocol", "1.0"); conn.setRequestProperty("digi-type", "sync"); conn.setRequestProperty("Content-Type", contentType);