rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/WmsOrderItemParam.java
@@ -63,9 +63,9 @@ // 建议目标仓库 private String palletId; // 调出仓 private String targetWareHouseId; private String targetWarehouseId; // 业务日期，对账使用，时间戳，精确到秒 private String sourceWareHouseId; private String sourceWarehouseId; // 入库类型 private String inStockType; // 货主类型 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/OrderItem.java
@@ -47,9 +47,9 @@ // 建议目标仓库 private String palletId; // 调出仓 private String targetWareHouseId; private String targetWarehouseId; // 业务日期，对账使用，时间戳，精确到秒 private String sourceWareHouseId; private String sourceWarehouseId; // 入库类型 private String inStockType; // 货主类型 @@ -83,11 +83,6 @@ @ApiModelProperty(value = "数量属性，外购等") private String erpClsId; @ApiModelProperty(value = "建议目标仓，入库") private String targetWarehouseId; @ApiModelProperty(value = "建议调出仓，出仓") private String sourceWarehouseId; public void setSpec(String spec) { this.spec = spec; rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/SyncOrdersItem.java
@@ -117,10 +117,10 @@ private String priceUnitId; @ApiModelProperty(value = "建议目标仓库", example = "WH001") private String targetWareHouseId; private String targetWarehouseId; @ApiModelProperty(value = "调出仓", example = "WH002") private String sourceWareHouseId; private String sourceWarehouseId; @ApiModelProperty(value = "入库类型", example = "purchase") private String inStockType; @@ -162,13 +162,6 @@ @ApiModelProperty(value = "数量属性，外购等") private String erpClsId; @ApiModelProperty(value = "建议目标仓，入库") private String targetWarehouseId; @ApiModelProperty(value = "建议调出仓，出仓") private String sourceWarehouseId; /** * 获取实际的物料编码 * 优先使用 matnr，如果为空则使用 matNr @@ -298,8 +291,8 @@ throw new IllegalArgumentException("生产入库明细必须提供托盘码"); } if (!Cools.isEmpty(targetWareHouseId) && !Cools.isEmpty(sourceWareHouseId)) { if (targetWareHouseId.equals(sourceWareHouseId)) { if (!Cools.isEmpty(targetWarehouseId) && !Cools.isEmpty(sourceWarehouseId)) { if (targetWarehouseId.equals(sourceWarehouseId)) { throw new IllegalArgumentException("目标仓库和调出仓库不能相同"); } } @@ -324,7 +317,7 @@ */ @JsonIgnore public boolean isTransferItem() { return !Cools.isEmpty(sourceWareHouseId) && !Cools.isEmpty(targetWareHouseId); return !Cools.isEmpty(sourceWarehouseId) && !Cools.isEmpty(targetWarehouseId); } /** rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -490,20 +490,20 @@ map.put("model", orderItem.getModel()); map.put("stockUnit", orderItem.getUnit()); map.put("purUnit", orderItem.getUnit()); map.put("baseUnit", orderItem.getUnit()); map.put("useOrgId", orderItem.getUnit()); map.put("useOrgName", orderItem.getUnit()); map.put("erpClsId", orderItem.getUnit()); map.put("priceUnitId", orderItem.getUnit()); map.put("inStockType", orderItem.getUnit()); map.put("ownerTypeId", orderItem.getUnit()); map.put("ownerId", orderItem.getUnit()); map.put("ownerName", orderItem.getUnit()); map.put("keeperTypeId", orderItem.getUnit()); map.put("keeperId", orderItem.getUnit()); map.put("keeperName", orderItem.getUnit()); map.put("targetWarehouseId", orderItem.getUnit()); map.put("sourceWarehouseId", orderItem.getUnit()); map.put("baseUnit", orderItem.getBaseUnitId()); map.put("useOrgId", orderItem.getUseOrgId()); map.put("useOrgName", orderItem.getUseOrgName()); map.put("erpClsId", orderItem.getErpClsId()); map.put("priceUnitId", orderItem.getPriceUnitId()); map.put("inStockType", orderItem.getInStockType()); map.put("ownerTypeId", orderItem.getOwnerTypeId()); map.put("ownerId", orderItem.getOwnerId()); map.put("ownerName", orderItem.getOwnerName()); map.put("keeperTypeId", orderItem.getKeeperTypeId()); map.put("keeperId", orderItem.getKeeperId()); map.put("keeperName", orderItem.getKeeperName()); map.put("targetWarehouseId", orderItem.getTargetWarehouseId()); map.put("sourceWarehouseId", orderItem.getSourceWarehouseId()); if (!asnOrderItemService.fieldsSave(map, loginUserId)) { throw new CoolException("明细保存失败！！");
