Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java

@@ -1,35 +1,32 @@
 package com.win.module.wms.controller.purchasePlan;
 
+import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.framework.common.pojo.PageResult;
+import com.win.framework.excel.core.util.ExcelUtils;
+import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.purchasePlan.vo.*;
-import org.springframework.web.bind.annotation.*;
+import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert;
-import javax.annotation.Resource;
+import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
-import org.springframework.validation.annotation.Validated;
+import com.win.module.wms.service.purchasePlan.PurchasePlanDetailService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.*;
+import javax.annotation.Resource;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import javax.validation.Valid;
 import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
 
-import com.win.framework.common.pojo.PageResult;
-import com.win.framework.common.pojo.CommonResult;
 import static com.win.framework.common.pojo.CommonResult.success;
-
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import com.win.framework.excel.core.util.ExcelUtils;
-
-import com.win.framework.operatelog.core.annotations.OperateLog;
-import static com.win.framework.operatelog.core.enums.OperateTypeEnum.*;
-
-
-import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
-import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert;
-import com.win.module.wms.service.purchasePlan.PurchasePlanDetailService;
 
 @Tag(name = "管理后台 - 要货计划子")
 @RestController
@@ -121,4 +118,13 @@ public class PurchasePlanDetailController {
         ExcelUtils.write(response, "要货计划子.xls", "数据", PurchasePlanDetailExcelVO.class, datas);
     }
 
+    @GetMapping("/allList")
+    @Operation(summary = "高级搜索获得要货计划子信息")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-plan-detail:allList')")
+    public CommonResult<List<PurchasePlanDetailRespVO>> selectAllList(@RequestParam String poNumber) {
+        List<PurchasePlanDetailDO> list = purchasePlanDetailService.selectAllList(poNumber);
+        List<PurchasePlanDetailRespVO> result = PurchasePlanDetailConvert.INSTANCE.convertList(list);
+        return success(result);
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java

@@ -12,8 +12,11 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO;
 import com.win.module.wms.controller.purchase.vo.PurchaseMainImportVO;
 import com.win.module.wms.controller.purchasePlan.vo.*;
+import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordDetailRespVO;
 import com.win.module.wms.convert.purchasePlan.PurchasePlanMainConvert;
+import com.win.module.wms.convert.purchasereceiptRecord.PurchasereceiptRecordDetailConvert;
 import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.purchasePlan.PurchasePlanMainService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -92,7 +95,7 @@ public class PurchasePlanMainController {
 
     @GetMapping("/page")
     @Operation(summary = "获得要货计划主分页")
-    @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:query')")
+    @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:page')")
     public CommonResult<PageResult<PurchasePlanMainRespVO>> getPurchasePlanMainPage(@Valid PurchasePlanMainPageReqVO pageVO) {
         PageResult<PurchasePlanMainDO> pageResult = purchasePlanMainService.getPurchasePlanMainPage(pageVO);
         return success(PurchasePlanMainConvert.INSTANCE.convertPage(pageResult));
@@ -221,5 +224,4 @@ public class PurchasePlanMainController {
         return success(count > 0);
     }
 
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java

@@ -9,10 +9,7 @@ import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
-import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
-import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO;
 import com.win.module.wms.controller.purchasereceiptRequest.vo.*;
-import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO;
 import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO;
@@ -65,7 +62,7 @@ public class PurchasereceiptRequestMainController {
     @Operation(summary = "更新采购收货申请主")
     @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:update')")
     public CommonResult<Boolean> updatePurchasereceiptRequestMain(@Valid @RequestBody PurchasereceiptRequestMainUpdateReqVO updateReqVO) {
-        Integer result = purchasereceiptRequestMainService.updatePurchasereceiptRequestMain(updateReqVO);
+        int result = purchasereceiptRequestMainService.updatePurchasereceiptRequestMain(updateReqVO);
         return success(result > 0);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java

@@ -62,6 +62,14 @@ public class PurchasereturnRequestMainController {
         return success(purchasereturnRequestMainService.createPurchasereturnRequestMain(createReqVO));
     }
 
+    @PutMapping("/update")
+    @Operation(summary = "更新采购退货申请主")
+    @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:update')")
+    public CommonResult<Boolean> updatePurchasereturnRequestMain(@Valid @RequestBody PurchasereturnRequestMainUpdateReqVO updateReqVO) {
+        int result = purchasereturnRequestMainService.updatePurchasereturnRequestMain(updateReqVO);
+        return success(result > 0);
+    }
+
     @GetMapping("/page")
     @Operation(summary = "获得采购退货申请主分页")
     @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:query')")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchasePlan/PurchasePlanDetailMapper.java

@@ -11,6 +11,7 @@ import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReq
 import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO;
 import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
 import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -60,4 +61,9 @@ public interface PurchasePlanDetailMapper extends BaseMapperX<PurchasePlanDetail
                 .orderByDesc(PurchasePlanDetailDO::getId));
     }
 
+    default List<PurchasePlanDetailDO> selectAllList(String poNumber) {
+        return selectList(new LambdaQueryWrapperX<PurchasePlanDetailDO>()
+                .eq(PurchasePlanDetailDO::getPoNumber, poNumber));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -381,6 +381,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectRecord");
             inspectRecordMainCreateReqVO.setBusinessType(businesstypeDO.getCode());
+            inspectRecordMainCreateReqVO.setId(null);
             inspectRecordMainMapper.insert(InspectRecordMainConvert.INSTANCE.convert(inspectRecordMainCreateReqVO));
             for(InspectRequestDetailDO inspectRequestDetailDO : detailDOList) {
                 InspectRecordDetailCreateReqVO inspectRecordDetailCreateReqVO = new InspectRecordDetailCreateReqVO();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailService.java

@@ -10,6 +10,7 @@ import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO
 import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailUpdateReqVO;
 import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO;
 import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 
 /**
  * 要货计划子 Service 接口
@@ -80,4 +81,11 @@ public interface PurchasePlanDetailService {
      */
     List<PurchasePlanDetailDO> getPurchasePlanDetailList(PurchasePlanDetailExportReqVO exportReqVO);
 
+    /**
+     * 根据主表number查询
+     * @param poNumber
+     * @return
+     */
+    List<PurchasePlanDetailDO> selectAllList(String poNumber);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java

@@ -5,10 +5,12 @@ import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailCreateReq
 import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailExportReqVO;
 import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailPageReqVO;
 import com.win.module.wms.controller.purchasePlan.vo.PurchasePlanDetailUpdateReqVO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -89,5 +91,17 @@ public class PurchasePlanDetailServiceImpl implements PurchasePlanDetailService
     public List<PurchasePlanDetailDO> getPurchasePlanDetailList(PurchasePlanDetailExportReqVO exportReqVO) {
         return purchasePlanDetailMapper.selectList(exportReqVO);
     }
+    @Override
+    public List<PurchasePlanDetailDO> selectAllList(String poNumber) {
+        List<PurchasePlanDetailDO> newList = new ArrayList<>();
+        List<PurchasePlanDetailDO> purchasePlanDetailDOList = purchasePlanDetailMapper.selectAllList(poNumber);
+        for (PurchasePlanDetailDO purchasePlanDetailDO : purchasePlanDetailDOList) {
+           if(purchasePlanDetailDO.getPlanQty().compareTo(purchasePlanDetailDO.getShippedQty())> 0){
+               newList.add(purchasePlanDetailDO);
+           }
+        }
+        return newList;
+    }
+
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainService.java

@@ -23,6 +23,13 @@ public interface PurchasereturnRequestMainService {
      */
     Long createPurchasereturnRequestMain(@Valid PurchasereturnRequestMainCreateReqVO createReqVO);
 
+    /**
+     * 更新采购退货申请主
+     *
+     * @param updateReqVO 更新信息
+     */
+    int updatePurchasereturnRequestMain(@Valid PurchasereturnRequestMainUpdateReqVO updateReqVO);
+
     /**
      * 获得用高级搜索采购退货申请主分页列表
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -133,6 +133,16 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         return mainDO.getId();
     }
 
+    @Override
+    public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) {
+        // 校验存在
+        validatePurchasereturnRequestMainExists(updateReqVO.getId());
+        // 更新主表
+        PurchasereturnRequestMainDO purchasereturnRequestMainDO =PurchasereturnRequestMainConvert.INSTANCE.convert(updateReqVO);
+        trendsApi.createTrends(purchasereturnRequestMainDO.getId(), "purchasereturnRequest", "增加了采购退货申请", TrendsTypeEnum.CREATE);
+        return purchasereturnRequestMainMapper.updateById(purchasereturnRequestMainDO);
+    }
+
     @Override
     public PageResult<PurchasereturnRequestMainDO> getPurchasereturnRequestMainSenior(CustomConditions conditions) {
         return purchasereturnRequestMainMapper.selectSenior(conditions);
@@ -211,7 +221,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
     }
 
     private void ifDetailQtyBigThanQty(BigDecimal detailQty, BigDecimal qty) {
-        if (detailQty.compareTo(qty) > 0) {
+        if (detailQty.compareTo(qty) < 0) {
             throw exception(QTY_EXCEPTION, "退货数量" + qty + "不能大于收货数量" + detailQty);
         }
     }
@@ -419,13 +429,14 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         mainDo.setToAreaCodes(businesstypeDO.getInAreaCodes());
     }
 
-    private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDo, PurchasereturnRequestMainDO mainDO, List<String> inventoryStatusList) {
+    private BigDecimal validatorBalance(PurchasereturnRequestDetailDO detailDO, PurchasereturnRequestMainDO mainDO, List<String> inventoryStatusList) {
         BigDecimal bigDecimal = new BigDecimal(0);
-        List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getPackingNumber(), detailDo.getBatch(), detailDo.getFromLocationCode(), inventoryStatusList);
+        List<BalanceDO> balance = jobUtils.selectlocationReturnManagementAccuracy(detailDO.getItemCode(), detailDO.getPackingNumber(), detailDO.getBatch(), detailDO.getFromLocationCode(), inventoryStatusList);
         if (balance != null) {
             for (BalanceDO balanceDO : balance) {
                 bigDecimal = bigDecimal.add(balanceDO.getQty());
                 mainDO.setFromWarehouseCode(balanceDO.getWarehouseCode());
+                detailDO.setInventoryStatus(balanceDO.getInventoryStatus());
             }
         }
         return bigDecimal;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -612,18 +612,22 @@ public class RuleServiceImpl implements RuleService {
      * @return
      */
     private boolean forEachParams(Map<String, String> params, JSONArray conditionArray) {
+        boolean result1 = false;
         for(int i = 0; i < conditionArray.size(); i++) {
             JSONObject conditionObject = conditionArray.getJSONObject(i);
             for (String key : params.keySet()) {
                 if(key.equals(conditionObject.get("ParamCode")) && conditionObject.get("ParamCode") != null) {
-                    boolean result = this.checkCondition(conditionObject, key, params.get(key));
+                    boolean result2 = this.checkCondition(conditionObject, key, params.get(key));
-                    if(!result) {
+                    if(!result2) {
-                        return false;
+                        result1 = false;
+                        break;
+                    } else {
+                        result1 = true;
                     }
                 }
             }
         }
-        return true;
+        return result1;
     }
 
     /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -126,8 +126,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
     @Resource
     private LocationService locationService;
 
-
-
     @Override
     public Long createSupplierdeliverRequestMain(SupplierdeliverRequestMainCreateReqVO createReqVO) {
         // 插入主表
@@ -135,6 +133,8 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         createReqVO.setBusinessType(businesstypeDO.getCode());
         String number = serialNumberApi.generateCode(RuleCodeEnum.SUPPLIER_DELIVER_REQUEST.getCode());
         createReqVO.setNumber(number);
+        String asnNumber = serialNumberApi.generateCode(RuleCodeEnum.ASN_NUMBER.getCode());
+        createReqVO.setAsnNumber(asnNumber);
         createReqVO.setCreateTime(LocalDateTime.now());
         SupplierdeliverRequestMainDO supplierdeliverRequestMainDO = validatorToCreate(createReqVO);
         //调用自动执行方法
@@ -208,6 +208,16 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         List<SupplierdeliverRequestMainImportErrorVO> errorList = new ArrayList<>();
         for (SupplierdeliverRequestMainCreateReqVO createReqVO : datas) {
             SupplierdeliverRequestMainDO mainDo = SupplierdeliverRequestMainConvert.INSTANCE.convert(createReqVO);
+            // 插入主表
+            BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("SupplierDeliverRequest");
+            mainDo.setBusinessType(businesstypeDO.getCode());
+            String number = serialNumberApi.generateCode(RuleCodeEnum.SUPPLIER_DELIVER_REQUEST.getCode());
+            mainDo.setNumber(number);
+            if(mainDo.getAsnNumber().isEmpty()){
+                String asnNumber = serialNumberApi.generateCode(RuleCodeEnum.ASN_NUMBER.getCode());
+                mainDo.setAsnNumber(asnNumber);
+            }
+            mainDo.setCreateTime(LocalDateTime.now());
             String messageMain = validatorSupplierdeliverRequestMainImport(mainDo);
             List<SupplierdeliverRequestDetailCreateReqVO> subList = createReqVO.getSubList();
             List<SupplierdeliverRequestDetailDO> subDOList = SupplierdeliverRequestDetailConvert.INSTANCE.convertList03(subList);
@@ -227,8 +237,6 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             //写入数据
             if (flag) {
                 mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
-                BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseOrder");
-                mainDo.setBusinessType(businesstypeDO.getCode());
                 supplierdeliverRequestMainMapper.insert(mainDo);
                 for (SupplierdeliverRequestDetailDO detailDO : subDOList) {
                     detailDO.setMasterId(mainDo.getId());