标签管理

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackagePageReqVO.java

@@ -142,4 +142,6 @@ public class PackagePageReqVO extends PageParam {
     @Schema(description = "体积")
     private String volume;
 
+    @Schema(description = "标签类型")
+    private String regularParams;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java

@@ -21,49 +21,19 @@ import java.util.List;
 public interface PackageMapper extends BaseMapperX<PackageDO> {
 
     default PageResult<PackageDO> selectPage(PackagePageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<PackageDO>()
-                .eqIfPresent(PackageDO::getNumber, reqVO.getNumber())
-                .eqIfPresent(PackageDO::getItemCode, reqVO.getItemCode())
-                .likeIfPresent(PackageDO::getItemName, reqVO.getItemName())
-                .eqIfPresent(PackageDO::getItemDesc1, reqVO.getItemDesc1())
-                .eqIfPresent(PackageDO::getItemDesc2, reqVO.getItemDesc2())
-                .eqIfPresent(PackageDO::getBatch, reqVO.getBatch())
-                .eqIfPresent(PackageDO::getAltBatch, reqVO.getAltBatch())
-                .betweenIfPresent(PackageDO::getProduceDate, reqVO.getProduceDate())
-                .eqIfPresent(PackageDO::getValidityDays, reqVO.getValidityDays())
-                .betweenIfPresent(PackageDO::getExpireDate, reqVO.getExpireDate())
-                .eqIfPresent(PackageDO::getUom, reqVO.getUom())
-                .eqIfPresent(PackageDO::getQty, reqVO.getQty())
-                .eqIfPresent(PackageDO::getAltUom, reqVO.getAltUom())
-                .eqIfPresent(PackageDO::getAltQty, reqVO.getAltQty())
-                .eqIfPresent(PackageDO::getConvertRate, reqVO.getConvertRate())
-                .eqIfPresent(PackageDO::getStdPackQty, reqVO.getStdPackQty())
-                .eqIfPresent(PackageDO::getStdPackUnit, reqVO.getStdPackUnit())
-                .eqIfPresent(PackageDO::getToWarehouseCode, reqVO.getToWarehouseCode())
-                .eqIfPresent(PackageDO::getToDockCode, reqVO.getToDockCode())
-                .eqIfPresent(PackageDO::getToLocationCode, reqVO.getToLocationCode())
-                .eqIfPresent(PackageDO::getSupplierCode, reqVO.getSupplierCode())
-                .eqIfPresent(PackageDO::getSupplierItemCode, reqVO.getSupplierItemCode())
-                .eqIfPresent(PackageDO::getPoNumber, reqVO.getPoNumber())
-                .eqIfPresent(PackageDO::getPoLine, reqVO.getPoLine())
-                .eqIfPresent(PackageDO::getRpNumber, reqVO.getRpNumber())
-                .eqIfPresent(PackageDO::getAsnNumber, reqVO.getAsnNumber())
-                .eqIfPresent(PackageDO::getWoNumber, reqVO.getWoNumber())
-                .eqIfPresent(PackageDO::getWoLine, reqVO.getWoLine())
-                .eqIfPresent(PackageDO::getProductionLineCode, reqVO.getProductionLineCode())
-                .eqIfPresent(PackageDO::getTeamCode, reqVO.getTeamCode())
-                .eqIfPresent(PackageDO::getShiftCode, reqVO.getShiftCode())
-                .eqIfPresent(PackageDO::getCustomerCode, reqVO.getCustomerCode())
-                .eqIfPresent(PackageDO::getCustomerDockCode, reqVO.getCustomerDockCode())
-                .eqIfPresent(PackageDO::getCustomerItemCode, reqVO.getCustomerItemCode())
-                .eqIfPresent(PackageDO::getSoNumber, reqVO.getSoNumber())
-                .eqIfPresent(PackageDO::getSoLine, reqVO.getSoLine())
-                .eqIfPresent(PackageDO::getEqLevel, reqVO.getEqLevel())
-                .eqIfPresent(PackageDO::getOwnerCode, reqVO.getOwnerCode())
-                .eqIfPresent(PackageDO::getWeight, reqVO.getWeight())
-                .eqIfPresent(PackageDO::getArea, reqVO.getArea())
-                .eqIfPresent(PackageDO::getVolume, reqVO.getVolume())
-                .orderByDesc(PackageDO::getId));
+        LambdaQueryWrapperX<PackageDO> lambdaQueryWrapperX = new LambdaQueryWrapperX<>();
+        lambdaQueryWrapperX.eqIfPresent(PackageDO::getNumber, reqVO.getNumber());
+        lambdaQueryWrapperX.eqIfPresent(PackageDO::getItemCode, reqVO.getItemCode());
+        lambdaQueryWrapperX.eqIfPresent(PackageDO::getBatch, reqVO.getBatch());
+        if(reqVO.getRegularParams().equals("procure")) {
+            lambdaQueryWrapperX.isNotNull(PackageDO::getToWarehouseCode);
+        } else if(reqVO.getRegularParams().equals("manufacture")) {
+            lambdaQueryWrapperX.isNotNull(PackageDO::getWoNumber);
+            lambdaQueryWrapperX.ne(PackageDO::getWoNumber,"");
+        } else if(reqVO.getRegularParams().equals("utensil")) {
+            lambdaQueryWrapperX.isNotNull(PackageDO::getCustomerCode);
+        }
+        return selectPage(reqVO, lambdaQueryWrapperX);
     }
 
     default PageResult<PackageDO> selectSenior(CustomConditions conditions) {