采购退货增加单据打印功能

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java

@@ -117,7 +117,7 @@ public interface BalanceMapper extends BaseMapperX<BalanceDO> {
         for(String str : locationTypeList) {
             type.append("'").append(str).append("',");
         }
-        queryWrapper.inSql("location_code", "SELECT `code` FROM basic_location WHERE `type` IN ("+ type.substring(0, type.length() - 1)+") AND available='TRUE' AND deleted=0");
+        queryWrapper.inSql("area_code", "SELECT `code` FROM basic_area WHERE `type` IN ("+ type.substring(0, type.length() - 1)+") AND available='TRUE' AND deleted=0");
         return selectList(queryWrapper);
     }
 

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

@@ -964,8 +964,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
         supplierdeliverRequestMain.setStatus(RequestStatusEnum.COMPLETED.getCode());
         supplierdeliverRequestMainMapper.updateById(supplierdeliverRequestMain);
         trendsApi.createTrends(supplierdeliverRequestMain.getId(), "SupplierdeliverRequest", "处理了供应商发货申请", TrendsTypeEnum.CREATE);
-//        // 创建采购收货申请
-//        this.createPurchasereceiptRequest(supplierdeliverRecordMainDO, supplierdeliverRecordDetailDOList);
+
+        SwitchDO switchDO = switchService.selectSwitchExist("CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated");
+        if(switchDO != null) {
+            // 创建采购收货申请
+            this.createPurchasereceiptRequest(supplierdeliverRecordMainDO, supplierdeliverRecordDetailDOList);
+        }
         return result;
     }
 
@@ -1019,23 +1023,20 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
             //更新采购订单的已发货数量
             purchaseMainService.updateOrderPurchaseShippedQty(detailDO.getPoNumber(), detailDO.getPoLine(), detailDO.getItemCode(), detailDO.getQty());
         }
-        SwitchDO switchDO = switchService.selectSwitchExist("CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated");
-        if(switchDO != null){
-            // 创建采购收货申请
-            purchasereceiptRequestMainCreateReqVO.setId(null);
-            purchasereceiptRequestMainCreateReqVO.setCreateTime(null);
-            purchasereceiptRequestMainCreateReqVO.setCreator(null);
-            purchasereceiptRequestMainCreateReqVO.setUpdateTime(null);
-            purchasereceiptRequestMainCreateReqVO.setUpdater(null);
-            purchasereceiptRequestMainCreateReqVO.setSubList(purchasereceiptRequestDetailCreateReqVOList);
-            if (!purchasereceiptRequestDetailCreateReqVOList.isEmpty()) {
-                String purchasereceiptNumber = purchasereceiptRequestMainService.createPurchasereceiptRequestMain(purchasereceiptRequestMainCreateReqVO);
-                if(StringUtils.isNotEmpty(purchasereceiptNumber)){
-                    mainDO.setPurchasereceiptRequestFlag(true);
-                    mainDO.setPurchasereceiptRequestNumber(purchasereceiptNumber);
-                    supplierdeliverRecordMainMapper.updateById(mainDO);
-                    return purchasereceiptNumber;
-                }
+        // 创建采购收货申请
+        purchasereceiptRequestMainCreateReqVO.setId(null);
+        purchasereceiptRequestMainCreateReqVO.setCreateTime(null);
+        purchasereceiptRequestMainCreateReqVO.setCreator(null);
+        purchasereceiptRequestMainCreateReqVO.setUpdateTime(null);
+        purchasereceiptRequestMainCreateReqVO.setUpdater(null);
+        purchasereceiptRequestMainCreateReqVO.setSubList(purchasereceiptRequestDetailCreateReqVOList);
+        if (!purchasereceiptRequestDetailCreateReqVOList.isEmpty()) {
+            String purchasereceiptNumber = purchasereceiptRequestMainService.createPurchasereceiptRequestMain(purchasereceiptRequestMainCreateReqVO);
+            if(StringUtils.isNotEmpty(purchasereceiptNumber)){
+                mainDO.setPurchasereceiptRequestFlag(false);
+                mainDO.setPurchasereceiptRequestNumber(purchasereceiptNumber);
+                supplierdeliverRecordMainMapper.updateById(mainDO);
+                return purchasereceiptNumber;
             }
         }
         supplierdeliverRecordMainMapper.updateById(mainDO);