wms / wms_shandonghaiwang · Commits

Commit 36b3c7a0e19a2a869dbcbfe20923dfa6376e6c3e

Authored by 易文鹏
1 parent 2a87cd0b

调整入库和出库回传MOM接口字段数据

Inline Side-by-side
Showing 3 changed files with 19 additions and 17 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
  View file @36b3c7a
... ... @@ -488,16 +488,19 @@ public class MesReceiptController extends BaseController {
488 488 Rd_In_S.put("cInvCode", receiptDetail.getMaterialCode());
489 489 Rd_In_S.put("Iquantity", receiptDetail.getTaskQty());
490 490 Rd_In_S.put("iFQuantity", receiptDetail.getQty());
491   - Rd_In_S.put("cwhcode", receiptDetail.getWarehouseCode());
  491 + Rd_In_S.put("cwhcode", "035");
492 492 Rd_In_S.put("MOCode", receiptDetail.getNoticeNo());
493 493 Rd_In_S.put("ISUrgent", receiptDetail.getIsUrgent());
494 494 Rd_In_S.put("receiptBarcode", receiptDetail.getReceiptBarcode());
495 495 Rd_In_S.put("warehouse", receiptHeader.getWarehouse());
496 496 Rd_In_S.put("warehouseName", receiptHeader.getWarehouseName());
497   - Rd_In_S.put("creatorCode", receiptDetail.getLastUpdatedBy());
498   - Rd_In_S.put("creatorName", receiptDetail.getLastUpdatedByName());
  497 + Rd_In_S.put("creatorCode", user.getLoginName());
  498 + Rd_In_S.put("creatorName", receiptDetail.getLastUpdatedBy());
499 499 Rd_In_S.put("productionWorker", receiptHeader.getProductionWorker());
500 500 Rd_In_S.put("productionWorkerName", receiptHeader.getProductionWorkerName());
  501 + Rd_In_S.put("ifrom", receiptDetail.getIfrom());
  502 + Rd_In_S.put("LMPKID", receiptDetail.getLMPKID());
  503 + Rd_In_S.put("LSPKID", receiptDetail.getLSPKID());
501 504 jsonArray.add(Rd_In_S);
502 505 JSONObject data = new JSONObject();
503 506 data.put("Rd_In_M", Rd_In_M);
... ... @@ -665,6 +668,7 @@ public class MesReceiptController extends BaseController {
665 668 public JSONArray getRd_Out_S(ShipmentHeader shipmentHeader, List<ShipmentDetail> shipmentDetailList) {
666 669 JSONArray jsonArray = new JSONArray();
667 670 shipmentDetailList.forEach(shipmentDetail -> {
  671 + User user = userService.selectUserByEmail(shipmentDetail.getLastUpdatedBy());
668 672 JSONObject Rd_Out_S = new JSONObject();
669 673 Rd_Out_S.put("MGPK", shipmentHeader.getMOMID());
670 674 Rd_Out_S.put("SGPK", shipmentDetail.getMOMID());
... ... @@ -674,15 +678,19 @@ public class MesReceiptController extends BaseController {
674 678 Rd_Out_S.put("Iquantity", shipmentDetail.getTaskQty());
675 679 // MOM传入的入库数量
676 680 Rd_Out_S.put("iFQuantity", shipmentDetail.getQty());
677   - Rd_Out_S.put("cwhcode", shipmentDetail.getWarehouseCode());
  681 + Rd_Out_S.put("cwhcode", "035");
678 682 Rd_Out_S.put("MOCode", shipmentDetail.getNoticeNo());
679 683 Rd_Out_S.put("ISUrgent", shipmentDetail.getIsUrgent());
  684 + Rd_Out_S.put("updatedByNo", user.getLoginName());
680 685 Rd_Out_S.put("updatedBy", shipmentDetail.getLastUpdatedBy());
681 686 Rd_Out_S.put("warehouse", shipmentHeader.getWarehouse());
682 687 Rd_Out_S.put("warehouseName", shipmentHeader.getWarehouseName());
683   - Rd_Out_S.put("creatorCode", shipmentDetail.getLastUpdatedBy());
684   - Rd_Out_S.put("creatorName", shipmentDetail.getLastUpdatedByName());
685   - Rd_Out_S.put("requestedStartDate", shipmentHeader.getRequestedStartDate());
  688 + Rd_Out_S.put("creatorCode", shipmentHeader.getCreatorCode());
  689 + Rd_Out_S.put("creatorName", shipmentHeader.getCreatorName());
  690 +// Rd_Out_S.put("requestedStartDate", shipmentHeader.getRequestedStartDate());
  691 + Rd_Out_S.put("ifrom", shipmentDetail.getIfrom());
  692 + Rd_Out_S.put("LMPKID", shipmentDetail.getLMPKID());
  693 + Rd_Out_S.put("LSPKID", shipmentDetail.getLSPKID());
686 694 jsonArray.add(Rd_Out_S);
687 695 });
688 696 return jsonArray;
... ... @@ -690,19 +698,14 @@ public class MesReceiptController extends BaseController {
690 698  
691 699 public JSONObject getRd_Out_M(@RequestBody ShipmentHeader shipmentHeader) {
692 700 User user = userService.selectUserByEmail(shipmentHeader.getLastUpdatedBy());
693   -
694 701 JSONObject Rd_Out_M = new JSONObject();
695 702 Rd_Out_M.put("mno", shipmentHeader.getCode());
696 703 Rd_Out_M.put("MGPK", shipmentHeader.getMOMID());
697 704 Rd_Out_M.put("cBusType", shipmentHeader.getShipmentType());
698 705 Rd_Out_M.put("TAID", shipmentHeader.getTAID());
699 706 Rd_Out_M.put("FAID", shipmentHeader.getFAID());
700   - if (user == null) {
701   - Rd_Out_M.put("UserNo", shipmentHeader.getCreatedBy());
702   - } else {
703   - Rd_Out_M.put("UserNo", user.getLoginName());
704   - }
705   - Rd_Out_M.put("warehouse", shipmentHeader.getWarehouse());
  707 + Rd_Out_M.put("UserNo", user.getLoginName());
  708 + Rd_Out_M.put("warehouse", "035");
706 709 Rd_Out_M.put("cDepCode", "01030101");//部门编码
707 710 Rd_Out_M.put("cWhCode", shipmentHeader.getWarehouse());//仓库编码
708 711 return Rd_Out_M;
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
  View file @36b3c7a
... ... @@ -593,8 +593,7 @@ public class ReceiptTaskService {
593 593 receiptHeader.setPushQty(pushQty);
594 594 receiptHeader.setFirstStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
595 595 receiptHeader.setPushSuccessStatus(3);//3回传了部分
596   - //海王项目数额没有小数点
597   - if (receiptHeader.getPushQty().intValue() == receiptHeader.getTotalQty().intValue()) {
  596 + if (receiptHeader.getPushQty().compareTo(receiptHeader.getTotalQty()) == 0) {
598 597 receiptHeader.setPushSuccessStatus(1);//1成功
599 598 receiptHeader.setLastStatus(QuantityConstant.RECEIPT_HEADER_RETURN);
600 599 }
... ...
src/main/resources/mybatis/monitor/ApiLogMapper.xml
  View file @36b3c7a
... ... @@ -73,6 +73,6 @@
73 73 DELETE
74 74 FROM api_log
75 75 WHERE apiName IN ('wcs任务完成', 'TaskAssign', '获取电视出库信息', '获取出站口出库信息', '获取电视入库信息',
76   - 'wcs到达拣选台', 'wcs调用wms分配库位', 'wms下发任务到wcs', '更新物料')
  76 + 'wcs到达拣选台', 'wcs调用wms分配库位', 'wms下发任务到wcs', '更新物料', '同步物料')
77 77 </update>
78 78 </mapper>
... ...