翻包记录修改

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageoverRecord/vo/PackageoverDetailBaseVO.java

@@ -78,11 +78,8 @@ public class PackageoverDetailBaseVO {
     @Schema(description = "项目代码")
     private String projectCode;
 
-    @Schema(description = "到数量")
+    @Schema(description = "数量")
-    private BigDecimal toQty;
+    private BigDecimal qty;
-
-    @Schema(description = "从数量")
-    private BigDecimal fromQty;
 
     @Schema(description = "计量单位")
     private String uom;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageoverRecord/vo/PackageoverDetailExcelVO.java

@@ -88,11 +88,8 @@ public class PackageoverDetailExcelVO {
     @ExcelProperty("项目代码")
     private String projectCode;
 
-    @ExcelProperty("到数量")
+    @ExcelProperty("数量")
-    private BigDecimal toQty;
+    private BigDecimal qty;
-
-    @ExcelProperty("从数量")
-    private BigDecimal fromQty;
 
     @ExcelProperty("计量单位")
     private String uom;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageoverRecord/vo/PackageoverDetailExportReqVO.java

@@ -86,11 +86,8 @@ public class PackageoverDetailExportReqVO {
     @Schema(description = "项目代码")
     private String projectCode;
 
-    @Schema(description = "到数量")
+    @Schema(description = "数量")
-    private BigDecimal toQty;
+    private BigDecimal qty;
-
-    @Schema(description = "从数量")
-    private BigDecimal fromQty;
 
     @Schema(description = "计量单位")
     private String uom;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageoverRecord/vo/PackageoverDetailPageReqVO.java

@@ -87,11 +87,8 @@ public class PackageoverDetailPageReqVO extends PageParam {
     @Schema(description = "项目代码")
     private String projectCode;
 
-    @Schema(description = "到数量")
+    @Schema(description = "数量")
-    private BigDecimal toQty;
+    private BigDecimal qty;
-
-    @Schema(description = "从数量")
-    private BigDecimal fromQty;
 
     @Schema(description = "计量单位")
     private String uom;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java

@@ -117,13 +117,9 @@ public class PackageoverDetailDO extends BaseDO {
      */
     private String projectCode;
     /**
-     * 到数量
+     * 数量
      */
-    private BigDecimal toQty;
+    private BigDecimal qty;
-    /**
-     * 从数量
-     */
-    private BigDecimal fromQty;
     /**
      * 计量单位
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageoverRecord/PackageoverRecordDetailMapper.java

@@ -43,8 +43,7 @@ public interface PackageoverRecordDetailMapper extends BaseMapperX<PackageoverDe
                 .eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1())
                 .eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2())
                 .eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode())
-                .eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty())
+                .eqIfPresent(PackageoverDetailDO::getQty, reqVO.getQty())
-                .eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty())
                 .eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType())
                 .eqIfPresent(PackageoverDetailDO::getFromPackUnit, reqVO.getFromPackUnit())
@@ -79,8 +78,7 @@ public interface PackageoverRecordDetailMapper extends BaseMapperX<PackageoverDe
                 .eqIfPresent(PackageoverDetailDO::getItemDesc1, reqVO.getItemDesc1())
                 .eqIfPresent(PackageoverDetailDO::getItemDesc2, reqVO.getItemDesc2())
                 .eqIfPresent(PackageoverDetailDO::getProjectCode, reqVO.getProjectCode())
-                .eqIfPresent(PackageoverDetailDO::getToQty, reqVO.getToQty())
+                .eqIfPresent(PackageoverDetailDO::getQty, reqVO.getQty())
-                .eqIfPresent(PackageoverDetailDO::getFromQty, reqVO.getFromQty())
                 .eqIfPresent(PackageoverDetailDO::getUom, reqVO.getUom())
                 .eqIfPresent(PackageoverDetailDO::getInterfaceType, reqVO.getInterfaceType())
                 .eqIfPresent(PackageoverDetailDO::getFromPackUnit, reqVO.getFromPackUnit())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageoverJob/PackageoverJobMainServiceImpl.java

@@ -310,8 +310,7 @@ public class PackageoverJobMainServiceImpl implements PackageoverJobMainService
             packageoverDetailDO.setUpdater(null);
             packageoverDetailDO.setUpdateTime(null);
             packageoverDetailDO.setFromPackingNumber(fromPackingNumberStrs.substring(0,fromPackingNumberStrs.toString().length()-1));
-            packageoverDetailDO.setFromQty(sumQty);
+            packageoverDetailDO.setQty(sumQty);
-            packageoverDetailDO.setToQty(sumQty);
             packageoverDetailDO.setLocationCode(packageoverJobDetailUpdateReqVO.getToLocationCode());
             packageoverDetailDO.setLocationGroupCode(packageoverJobDetailUpdateReqVO.getToLocationGroupCode());
             packageoverDetailDO.setFromBatch(packageoverJobDetailUpdateReqVO.getBatch());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageoverRecord/PackageoverRecordMainServiceImpl.java

@@ -131,7 +131,7 @@ public class PackageoverRecordMainServiceImpl implements PackageoverRecordMainSe
             if (detailDO.getFromPackingNumber() != null) {
                 fromPackingNumberStrs.append(detailDO.getFromPackingNumber()).append(",");
             }
-            sumQty = sumQty.add(detailDO.getFromQty());
+            sumQty = sumQty.add(detailDO.getQty());
 
             //查询库存余额
             List<String> inventoryStatusList = new ArrayList<>();
@@ -145,7 +145,7 @@ public class PackageoverRecordMainServiceImpl implements PackageoverRecordMainSe
             BeanUtils.copyProperties(detailDO, transactionCreateReqVOOut);
             TransactiontypeDO transactiontypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType());
             transactionCreateReqVOOut.setWorker(String.valueOf(userApi.getUser(getLoginUserId()).getId()));
-            transactionCreateReqVOOut.setQty(detailDO.getFromQty());
+            transactionCreateReqVOOut.setQty(detailDO.getQty());
             transactionCreateReqVOOut.setInventoryAction(transactiontypeDOOut.getInventoryAction());
             transactionCreateReqVOOut.setTransactionType(transactiontypeDOOut.getCode());
             transactionCreateReqVOOut.setBusinessType(mainDO.getBusinessType());
@@ -192,8 +192,7 @@ public class PackageoverRecordMainServiceImpl implements PackageoverRecordMainSe
             throw exception(ITEMBASIC_NOT_EXISTS);
         }
         packageoverDetailDO.setFromPackingNumber(fromPackingNumberStrs.substring(0,fromPackingNumberStrs.toString().length()-1));
-        packageoverDetailDO.setFromQty(sumQty);
+        packageoverDetailDO.setQty(sumQty);
-        packageoverDetailDO.setToQty(sumQty);
         packageoverDetailDO.setLocationCode(subDOList.get(0).getLocationCode());
         packageoverDetailDO.setLocationGroupCode(subDOList.get(0).getLocationGroupCode());
         packageoverDetailDO.setFromBatch(subDOList.get(0).getFromBatch());