From 29d3fa72b1a1b826201af2d4a5bddbf1db593830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 15 Apr 2025 16:09:27 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/data/MaterialShipRequest.java | 31 +- .../data/MaterialShipRequestDetail.java | 331 ++++++++++++++++++ zi-wms-environment/cmd/setenv.sh | 2 +- .../controller/AllocateStockInController.java | 8 +- .../idm/controller/SAPToWMSController.java | 4 +- .../Impl/MoveTransformServiceImpl.java | 5 +- 6 files changed, 373 insertions(+), 8 deletions(-) diff --git a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java index ddaebe3..782d028 100644 --- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java +++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java @@ -24,6 +24,12 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo { private MaterialShipRequestDetailKey key; @@ -13,6 +14,7 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo private String domesticExport; private double requestQuantity; private double assignedQuantity; + private String posid; @@ -183,6 +185,8 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo private String workOrder; @UserColumnMark private String supplierNO; + + public String getSupplierNO() { return supplierNO; } @@ -211,6 +215,332 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo private String workOrderType; @UserColumnMark private String line; + + public String getWidth() { + return width; + } + + public void setWidth(String width) { + this.width = width; + } + + public String getLength() { + return length; + } + + public void setLength(String length) { + this.length = length; + } + + public String getVolume() { + return volume; + } + + public void setVolume(String volume) { + this.volume = volume; + } + + public String getSalesorder() { + return salesorder; + } + + public void setSalesorder(String salesorder) { + this.salesorder = salesorder; + } + + public String getSalesorderdetailno() { + return salesorderdetailno; + } + + public void setSalesorderdetailno(String salesorderdetailno) { + this.salesorderdetailno = salesorderdetailno; + } + + public String getCustomerMaterial() { + return customerMaterial; + } + + public void setCustomerMaterial(String customerMaterial) { + this.customerMaterial = customerMaterial; + } + + public String getCustomerProduct() { + return customerProduct; + } + + public void setCustomerProduct(String customerProduct) { + this.customerProduct = customerProduct; + } + + public String getTexture() { + return texture; + } + + public void setTexture(String texture) { + this.texture = texture; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + + public String getReleaseForce() { + return releaseForce; + } + + public void setReleaseForce(String releaseForce) { + this.releaseForce = releaseForce; + } + + public String getTubeCore() { + return tubeCore; + } + + public void setTubeCore(String tubeCore) { + this.tubeCore = tubeCore; + } + + public String getCustomerStash() { + return customerStash; + } + + public void setCustomerStash(String customerStash) { + this.customerStash = customerStash; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public String getReservedNumber() { + return reservedNumber; + } + + public void setReservedNumber(String reservedNumber) { + this.reservedNumber = reservedNumber; + } + + public String getReservedProjectNumb() { + return reservedProjectNumb; + } + + public void setReservedProjectNumb(String reservedProjectNumb) { + this.reservedProjectNumb = reservedProjectNumb; + } + + public String getReceiveProductionOrderNumber() { + return receiveProductionOrderNumber; + } + + public void setReceiveProductionOrderNumber(String receiveProductionOrderNumber) { + this.receiveProductionOrderNumber = receiveProductionOrderNumber; + } + + public String getIssueProductionOrderNumber() { + return issueProductionOrderNumber; + } + + public void setIssueProductionOrderNumber(String issueProductionOrderNumber) { + this.issueProductionOrderNumber = issueProductionOrderNumber; + } + + public String getProductionSupervisor() { + return productionSupervisor; + } + + public void setProductionSupervisor(String productionSupervisor) { + this.productionSupervisor = productionSupervisor; + } + + public String getCostCenter() { + return costCenter; + } + + public void setCostCenter(String costCenter) { + this.costCenter = costCenter; + } + + public String getCombinationOrderNumber() { + return combinationOrderNumber; + } + + public void setCombinationOrderNumber(String combinationOrderNumber) { + this.combinationOrderNumber = combinationOrderNumber; + } + + public String getZspec() { + return zspec; + } + + public void setZspec(String zspec) { + this.zspec = zspec; + } + + public String getUseDate() { + return useDate; + } + + public void setUseDate(String useDate) { + this.useDate = useDate; + } + + public String getSendSalesOrder() { + return sendSalesOrder; + } + + public void setSendSalesOrder(String sendSalesOrder) { + this.sendSalesOrder = sendSalesOrder; + } + + public String getSendSalesOrderDetailNo() { + return sendSalesOrderDetailNo; + } + + public void setSendSalesOrderDetailNo(String sendSalesOrderDetailNo) { + this.sendSalesOrderDetailNo = sendSalesOrderDetailNo; + } + + public String getSourceNo() { + return sourceNo; + } + + public void setSourceNo(String sourceNo) { + this.sourceNo = sourceNo; + } + + public String getReceiveSalesOrder() { + return receiveSalesOrder; + } + + public void setReceiveSalesOrder(String receiveSalesOrder) { + this.receiveSalesOrder = receiveSalesOrder; + } + + public String getReceiveSalesOrderDetailNo() { + return receiveSalesOrderDetailNo; + } + + public void setReceiveSalesOrderDetailNo(String receiveSalesOrderDetailNo) { + this.receiveSalesOrderDetailNo = receiveSalesOrderDetailNo; + } + + public String getErpReceiveFactory() { + return erpReceiveFactory; + } + + public void setErpReceiveFactory(String erpReceiveFactory) { + this.erpReceiveFactory = erpReceiveFactory; + } + + public String getCauseOfMovement() { + return causeOfMovement; + } + + public void setCauseOfMovement(String causeOfMovement) { + this.causeOfMovement = causeOfMovement; + } + + public double getReturnQuantity() { + return returnQuantity; + } + + public void setReturnQuantity(double returnQuantity) { + this.returnQuantity = returnQuantity; + } + + + //NEW + @Getter + @UserColumnMark + private String width; + @UserColumnMark + private String length; + @UserColumnMark + private String volume; + @UserColumnMark + private String salesorder; + @UserColumnMark + private String salesorderdetailno; + @UserColumnMark + private String customerMaterial; + @UserColumnMark + private String customerProduct; + @UserColumnMark + private String texture; + @UserColumnMark + private String color; + @UserColumnMark + private String releaseForce; + @UserColumnMark + private String tubeCore; + @UserColumnMark + private String customerStash; + @UserColumnMark + private String unit; + @UserColumnMark + private String reservedNumber; + @UserColumnMark + private String reservedProjectNumb; + @UserColumnMark + private String receiveProductionOrderNumber; + @UserColumnMark + private String issueProductionOrderNumber; + @UserColumnMark + private String productionSupervisor; + @UserColumnMark + private String costCenter; + @UserColumnMark + private String combinationOrderNumber; + @UserColumnMark + private String zspec; + @UserColumnMark + private String useDate; + @UserColumnMark + private String sendSalesOrder; + @UserColumnMark + private String sendSalesOrderDetailNo; + @UserColumnMark + private String sourceNo; + + @UserColumnMark + private String receiveSalesOrder; + @UserColumnMark + private String receiveSalesOrderDetailNo; + @UserColumnMark + private String erpReceiveFactory; + @UserColumnMark + private String causeOfMovement; + @UserColumnMark + private double returnQuantity; + + public String getClosedFlag() { + return closedFlag; + } + + public void setClosedFlag(String closedFlag) { + this.closedFlag = closedFlag; + } + + public String getGoalMaterialSpec() { + return goalMaterialSpec; + } + + public void setGoalMaterialSpec(String goalMaterialSpec) { + this.goalMaterialSpec = goalMaterialSpec; + } + + @UserColumnMark + private String closedFlag; + @UserColumnMark + private String goalMaterialSpec; public String getWorkOrder() { return workOrder; @@ -328,4 +658,5 @@ public class MaterialShipRequestDetail extends FieldAccessor implements DataInfo } + } diff --git a/zi-wms-environment/cmd/setenv.sh b/zi-wms-environment/cmd/setenv.sh index 43ed006..ea9f47a 100644 --- a/zi-wms-environment/cmd/setenv.sh +++ b/zi-wms-environment/cmd/setenv.sh @@ -11,7 +11,7 @@ fi JAVA_OPTS=" -Xms$3 -Xmx$4 -server " ### MWMS_OPTS IDMFRAME_FLOW_BPELJ=http://bpel.boe.com/bpelj -COMPANY=BOE +COMPANY=SDK FACTORY=ZXY CIM=MWMS SVR=$1 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java index d3da344..4204b0b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java @@ -10,6 +10,7 @@ import com.cim.idm.utils.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -24,7 +25,12 @@ import javax.servlet.http.HttpServletResponse; @Api(tags = "调拨入库") public class AllocateStockInController { - private AllocateStockInService allocateStockInService; + private final AllocateStockInService allocateStockInService; + + // 构造器注入 + public AllocateStockInController(AllocateStockInService allocateStockInService) { + this.allocateStockInService = allocateStockInService; + } /** * 调拨入库过账 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index 8f26a56..e8f5f7f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -990,7 +990,7 @@ public class SAPToWMSController { try { String shipRequestName =""; ArrayList> datas = request.getBODY(); - String sitename = System.getProperty("company"); + String sitename = "SDK"; for (Map data : datas) { shipRequestName = MapUtils.getString(data, "ZDNUM"); // 领料单、预留订单号 String erpFactory = MapUtils.getString(data, "WERKS"); // ERP工厂 @@ -1182,7 +1182,7 @@ public class SAPToWMSController { eventInfo.setEventUser(createUser); eventInfo.setEventName("CreateMaterialShipRequest"); - MaterialShipRequestDetailServiceProxy.getMaterialShipRequestDetailService().create( createInfo); + MaterialShipRequestDetailServiceProxy.getMaterialShipRequestDetailService().create(createInfo); }else { NonPrimaryKeyValueInfo nonPrimaryKeyValueInfo = new NonPrimaryKeyValueInfo(); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java index 4cee7b7..dfa759f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MoveTransformServiceImpl.java @@ -79,9 +79,8 @@ public class MoveTransformServiceImpl implements MoveTransformService { assignShipRequestInfo.setShipRequestName(shipRequestName); assignShipRequestInfo .setShipRequestDetailName(shipRequestDetailName); - MaterialPackingServiceProxy.getMaterialPackingService() - .assignShipRequest(mpkList, eventInfo, - assignShipRequestInfo); + MaterialPackingServiceProxy.getMaterialPackingService().assignShipRequest(mpkList, eventInfo,assignShipRequestInfo); + break; case "Dessign": EventInfo eventInfo1 = EventInfoUtil.makeEventInfo("Dessign", userId, "解绑单据");