| src/main/java/com/zy/asrs/controller/AgvOpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/controller/OpenController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -84,6 +84,10 @@ } } if(agvWrkMast.getWrkSts() >= 205){ return R.error("当前任务已完成"); } AgvTask agvTask = AgvTask.valueOf(param.getMethod()); Class<AgvTask> clz = AgvTask.class; try { src/main/java/com/zy/asrs/controller/OpenController.java
@@ -149,6 +149,7 @@ * 商品信息同步接口 */ @PostMapping("/mat/v1") @AppAuth(memo = "物料同步接口") public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, HttpServletRequest request){ @@ -300,6 +301,7 @@ @PostMapping("/order/pakout/default/v1") @AppAuth(memo = "同步工单单据") public synchronized R orderPakout(@RequestHeader(required = false) String appkey, //@RequestBody(required = false) HashMap<String,Object> param, @RequestBody(required = false) OrderProdSyncParam param, HttpServletRequest request){ @@ -312,11 +314,13 @@ boolean pakin = param.getIQuantity() > 0 ? true : false; mappingPakInOrderParam(param,pakin,docName); String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座委外材料出库单" : "银座委外材料退料单"; boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false; mappingPakOutOrderParam(param,pakin1,docName1); if(!Cools.isEmpty(param.getChildren())){ String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座委外材料出库单" : "银座委外材料退料单"; boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false; mappingPakOutOrderParam(param,pakin1,docName1); } }else { }else if(!Cools.isEmpty(param.getChildren())) { String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座生产材料出库单" : "银座生产材料退料单"; boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false; mappingPakOutOrderParam(param,pakin1,docName1); @@ -358,8 +362,10 @@ OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl(); orderDetl.setcInvCode(param.getCInvCode()); orderDetl.setiQuantity(param.getIQuantity()); orderDetl.setCsocode(param.getCsocode()); orderDetl.setcDefine22(param.getDefine24()); orderDetl.setbFree1(param.getBFree1()); orderDetl.setId(param.getId()); orderDetl.setIvouchrowno(param.getIvouchrowno()); //添加单据明细到单据主体 List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>(); @@ -395,7 +401,7 @@ orderDetl.setiQuantity(childInfo.getIQuantity()); orderDetl.setCsocode(param.getCsocode()); orderDetl.setbFree1(childInfo.getBFree1()); orderDetl.setID(childInfo.getIDs() + ""); orderDetl.setId(childInfo.getIds()); orderDetl.setIvouchrowno(childInfo.getIvouchrowno()); orderDetls.add(orderDetl); src/main/java/com/zy/asrs/entity/param/OrderProdSyncParam.java
@@ -37,6 +37,8 @@ private String sourceIndefine; //产品生产标识 private String prodIndefine; // private String id; //子件信息 private List<ChildInfo> children; @@ -118,9 +120,9 @@ @Data public static class ChildInfo{ //ID private Integer ID; private String id; //IDs private Integer IDs; private String ids; //工单号T private String orderNoT; //工单号 @@ -137,12 +139,12 @@ private String childNo; public void setID(Integer ID) { this.ID = ID; public void setId(String id) { this.id = id; } public void setIDs(Integer IDs) { this.IDs = IDs; public void setIds(String ids) { this.ids = ids; } public void setOrderNoT(String orderNoT) { src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -111,7 +111,7 @@ //规格（自由项1） private String bFree1; //采购订单子表标识 private String ID; private String id; //销售订单子表标识 private String iorderdid; @@ -168,8 +168,8 @@ this.bFree1 = bFree1; } public void setID(String ID) { this.ID = ID; public void setId(String id) { this.id = id; } public void setIorderdid(String iorderdid) { src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -975,7 +975,7 @@ //自由项 od.setDeadTime(odParam.getBFree1()); //IDs od.setSku(odParam.getID()); od.setSku(odParam.getId()); od.setLength(odParam.getINum());
@@ -107,9 +107,10 @@ childInfo.setINum(orderDetl.getLength() + ""); childInfo.setIinvexchrate(""); childInfo.setBFree1(orderDetl.getDeadTime()); childInfo.setIPOsID(orderDetl.getId() + ""); childInfo.setIPOsID(orderDetl.getSku()); childInfo.setCOrderCode(orderDetl.getOrderNo()); childInfo.setIvouchrowno(orderDetl.getItemNum()); childInfo.setCBatch(""); childInfo.setDefine22(orderDetl.getThreeCode()); paramChild.add(childInfo); @@ -130,13 +131,15 @@ .doPost(); JSONObject jsonObject = JSON.parseObject(response); if(Cools.isEmpty(jsonObject.get("errCode"))){ throw new CoolException(jsonObject.get("Message").toString()); if(Cools.isEmpty(jsonObject.get("succeed"))){ throw new CoolException(jsonObject.get("dsc").toString()); } int code = (int) jsonObject.get("errCode"); String succeed = jsonObject.get("succeed").toString(); int code = Cools.eq("0",succeed) ? 0 : 1; if(code != 0){ throw new CoolException(jsonObject.get("errMsg").toString()); throw new CoolException(jsonObject.get("dsc").toString()); } success = true; return code; src/main/resources/application.yml
@@ -86,11 +86,11 @@ containerArrivedPath: /conveyor/containerArrived u8: url: http://192.168.1.55:8010 orderReportPath: /api/RdAudit url: http://192.168.9.3:8877 orderReportPath: /DBMS/U8/CM/add ERP: url: http://192.168.1.55:8010 orderReportPath: /api/RdAudit url: http://39.184.149.30:8877 orderReportPath: /DBMS/U8/CM/add MES: url: http://192.168.1.55:8010 orderReportPath: /api/RdAudit
