Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailUpdateReqVO.java

@@ -30,4 +30,7 @@ public class ProductionreceiptJobDetailUpdateReqVO extends ProductionreceiptJobD
     @Schema(description = "到库位")
     private String toLocationCode;
 
+    @Schema(description = "供应商代码")
+    private String supplierCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java

@@ -91,23 +91,12 @@ public class ProductionreceiptRecordMainController {
 
     private List<ProductionreceiptRecordMainExcelVO> getExcelVo(List<ProductionreceiptRecordMainDO> list, Map<Integer, String[]> mapDropDown) {
         String[] locationType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LOCATION_TYPE);
-        mapDropDown.put(17, locationType);
-        mapDropDown.put(18, locationType);
-        String[] areaType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
-        mapDropDown.put(24, areaType);
-        mapDropDown.put(25, areaType);
+        mapDropDown.put(32, locationType);
         String[] trueFalse = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(26, trueFalse);
-        mapDropDown.put(27, trueFalse);
-        mapDropDown.put(28, trueFalse);
-        mapDropDown.put(29, trueFalse);
-        mapDropDown.put(30, trueFalse);
-        mapDropDown.put(31, trueFalse);
-        mapDropDown.put(32, trueFalse);
-        mapDropDown.put(33, trueFalse);
-        mapDropDown.put(34, trueFalse);
-        mapDropDown.put(35, trueFalse);
-        mapDropDown.put(36, trueFalse);
+        mapDropDown.put(19, trueFalse);
+        mapDropDown.put(20, trueFalse);
+        String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
+        mapDropDown.put(49, uom);
         List<ProductionreceiptRecordMainExcelVO> resultList = new ArrayList<>();
         // 导出
         for(ProductionreceiptRecordMainDO mainDO : list) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java

@@ -112,4 +112,8 @@ public class ProductionreceiptRecordDetailExportReqVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java

@@ -114,4 +114,7 @@ public class ProductionreceiptRecordDetailPageReqVO extends PageParam {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "主表ID")
+    private String masterId;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java

@@ -26,6 +26,9 @@ public class ProductionreceiptRecordMainExcelVO {
     @ExcelProperty("发料记录单号")
     private String issueRecordNumber;
 
+    @ExcelProperty("收料记录单号")
+    private String productionreceiptRecordNumber;
+
     @ExcelProperty("任务单号")
     private String jobNumber;
 
@@ -107,6 +110,9 @@ public class ProductionreceiptRecordMainExcelVO {
     @ExcelProperty("工位代码")
     private String workStationCode;
 
+    @ExcelProperty("供应商代码")
+    private String supplierCode;
+
     @ExcelProperty("在途库库位")
     private String onTheWayLocationCode;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java

@@ -161,4 +161,9 @@ public class ProductionreceiptRecordDetailDO extends BaseDO {
      */
     private String toOwnerCode;
 
+    /**
+     * 供应商代码
+     */
+    private String supplierCode;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionreceiptRecord/ProductionreceiptRecordDetailMapper.java

@@ -23,6 +23,7 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX<Product
 
     default PageResult<ProductionreceiptRecordDetailDO> selectPage(ProductionreceiptRecordDetailPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ProductionreceiptRecordDetailDO>()
+                .eqIfPresent(ProductionreceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())
@@ -64,6 +65,7 @@ public interface ProductionreceiptRecordDetailMapper extends BaseMapperX<Product
 
     default List<ProductionreceiptRecordDetailDO> selectList(ProductionreceiptRecordDetailExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<ProductionreceiptRecordDetailDO>()
+                .eqIfPresent(ProductionreceiptRecordDetailDO::getMasterId, reqVO.getMasterId())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getWorkStationCode, reqVO.getWorkStationCode())
                 .eqIfPresent(ProductionreceiptRecordDetailDO::getOnTheWayLocationCode, reqVO.getOnTheWayLocationCode())

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java

@@ -42,6 +42,7 @@ import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.expectout.ExpectoutService;
 import com.win.module.wms.service.jobsetting.JobsettingService;
 import com.win.module.wms.service.location.LocationService;
+import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
@@ -74,6 +75,8 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
 @Validated
 public class IssueJobMainServiceImpl implements IssueJobMainService {
 
+    @Resource
+    private SupplieritemService supplieritemService;
     @Resource
     private LocationService locationService;
     @Resource
@@ -447,6 +450,9 @@ public class IssueJobMainServiceImpl implements IssueJobMainService {
             onlinesettlementRecordDetailDO.setAreaCode(item.getToAreaCode());
             onlinesettlementRecordDetailDO.setMasterId(onlinesettlementRecordMainDO.getId());
             onlinesettlementRecordDetailDO.setNumber(number);
+            onlinesettlementRecordDetailDO.setSupplierCode(item.getSupplierCode());
+            // 查询 供应商物品 赋值 供应商物品代码
+            onlinesettlementRecordDetailDO.setSupplierItemCode(supplieritemService.selectSupplierItemExist(item.getSupplierCode(),item.getItemCode()).getSupplierItemCode());
             onlinesettlementRecordDetailDO.setId(null);
             onlinesettlementRecordDetailDO.setCreator(null);
             onlinesettlementRecordDetailDO.setCreateTime(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java

@@ -607,6 +607,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService {
     private void generateJob (IssueRequestMainDO mainDO, List<IssueRequestDetailDO> detailDO) {
         //跳过任务直接生成记录
         if("TRUE".equals(mainDO.getDirectCreateRecord())) {
+//            TODO: 发料申请 跳过任务直接生成记录 未做！！
 //            PurchasereceiptRecordMainCreateReqVO purchasereceiptRecordMainCreateReqVO = new PurchasereceiptRecordMainCreateReqVO();
 //            BeanUtils.copyProperties(mainDO, purchasereceiptRecordMainCreateReqVO);
 //            purchasereceiptRecordMainCreateReqVO.setRequestNumber(mainDO.getNumber());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java

@@ -16,13 +16,18 @@ import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.productionreceiptJob.ProductionreceiptJobMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO;
+import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
+import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordDetailDO;
+import com.win.module.wms.dal.dataobject.onlinesettlementRecord.OnlinesettlementRecordMainDO;
 import com.win.module.wms.dal.dataobject.production.ProductionDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptJob.ProductionreceiptJobMainDO;
 import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.productionreceiptRecord.ProductionreceiptRecordMainDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
+import com.win.module.wms.dal.mysql.onlinesettlementRecord.OnlinesettlementRecordDetailMapper;
+import com.win.module.wms.dal.mysql.onlinesettlementRecord.OnlinesettlementRecordMainMapper;
 import com.win.module.wms.dal.mysql.productionreceiptJob.ProductionreceiptJobMainMapper;
 import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.productionreceiptRecord.ProductionreceiptRecordMainMapper;
@@ -30,6 +35,7 @@ import com.win.module.wms.enums.job.JobStatusState;
 import com.win.module.wms.service.expectin.ExpectinService;
 import com.win.module.wms.service.location.LocationService;
 import com.win.module.wms.service.production.ProductionMainService;
+import com.win.module.wms.service.supplieritem.SupplieritemService;
 import com.win.module.wms.service.transaction.TransactionService;
 import com.win.module.wms.util.JobUtils;
 import org.springframework.beans.BeanUtils;
@@ -55,6 +61,12 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*;
 @Validated
 public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJobMainService {
 
+    @Resource
+    private OnlinesettlementRecordDetailMapper onlinesettlementRecordDetailMapper;
+    @Resource
+    private SupplieritemService supplieritemService;
+    @Resource
+    private OnlinesettlementRecordMainMapper onlinesettlementRecordMainMapper;
     @Resource
     private ExpectinService expectinService;
     @Resource
@@ -290,6 +302,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
                     productionreceiptRecordDetailDO.setToContainerNumber(DetailUpdateItem.getToContainerNumber());
                     productionreceiptRecordDetailDO.setInventoryStatus(DetailUpdateItem.getToInventoryStatus());
                     productionreceiptRecordDetailDO.setQty(DetailUpdateItem.getHandleQty());
+                    productionreceiptRecordDetailDO.setSupplierCode(DetailUpdateItem.getSupplierCode());
                     // 根据 to库位 查询 库位组 库区
                     LocationDO locationDO = locationService.selectLocation(DetailUpdateItem.getToLocationCode());
                     productionreceiptRecordDetailDO.setToLocationGroupCode(locationDO.getLocationGroupCode());
@@ -327,6 +340,8 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
         if(!productionreceiptRecordDetailDOList.isEmpty()) {
             productionreceiptRecordDetailMapper.insertBatch(productionreceiptRecordDetailDOList);
         }
+        // 创建 上线结算记录
+        createOnlinesettlementRecord(productionreceiptRecordMainDO,productionreceiptRecordDetailDOList);
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);
         //移除预计入
@@ -335,4 +350,54 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob
         trendsApi.createTrends(productionreceiptJobMainDO.getId(), "productionreceiptJob", "执行了生产收料任务", TrendsTypeEnum.UPDATE);
         return result;
     }
+
+    /**
+     * 创建 上线结算记录
+     * @param productionreceiptRecordMainDO
+     * @param productionreceiptRecordDetailDOList
+     */
+    private void createOnlinesettlementRecord (ProductionreceiptRecordMainDO productionreceiptRecordMainDO, List<ProductionreceiptRecordDetailDO> productionreceiptRecordDetailDOList) {
+        OnlinesettlementRecordMainDO onlinesettlementRecordMainDO = new OnlinesettlementRecordMainDO();
+        BeanUtils.copyProperties(productionreceiptRecordMainDO, onlinesettlementRecordMainDO);
+        onlinesettlementRecordMainDO.setProductionreceiptRecordNumber(productionreceiptRecordMainDO.getNumber());
+        onlinesettlementRecordMainDO.setWarehouseCode(productionreceiptRecordMainDO.getToWarehouseCode());
+        String number = serialNumberApi.generateCode(RuleCodeEnum.ONLINE_SETTLEMENT_RECORD.getCode());
+        onlinesettlementRecordMainDO.setId(null);
+        onlinesettlementRecordMainDO.setNumber(number);
+        onlinesettlementRecordMainDO.setBusinessType("");
+        onlinesettlementRecordMainDO.setInTransactionType("");
+        onlinesettlementRecordMainDO.setOutTransactionType("");
+        onlinesettlementRecordMainDO.setRequestNumber("");
+        onlinesettlementRecordMainDO.setCreator(null);
+        onlinesettlementRecordMainDO.setCreateTime(null);
+        onlinesettlementRecordMainDO.setUpdater(null);
+        onlinesettlementRecordMainDO.setUpdateTime(null);
+        onlinesettlementRecordMainMapper.insert(onlinesettlementRecordMainDO);
+        //上线结算记录子 集合
+        List<OnlinesettlementRecordDetailDO> onlinesettlementRecordDetailDOList = new ArrayList<>();
+        productionreceiptRecordDetailDOList.forEach(item -> {
+            OnlinesettlementRecordDetailDO onlinesettlementRecordDetailDO = new OnlinesettlementRecordDetailDO();
+            BeanUtils.copyProperties(item, onlinesettlementRecordDetailDO);
+            onlinesettlementRecordDetailDO.setPackingNumber(item.getToPackingNumber());
+            onlinesettlementRecordDetailDO.setContainerNumber(item.getToContainerNumber());
+            onlinesettlementRecordDetailDO.setBatch(item.getToBatch());
+            onlinesettlementRecordDetailDO.setLocationCode(item.getToLocationCode());
+            onlinesettlementRecordDetailDO.setLocationGroupCode(item.getToLocationGroupCode());
+            onlinesettlementRecordDetailDO.setAreaCode(item.getToAreaCode());
+            onlinesettlementRecordDetailDO.setMasterId(onlinesettlementRecordMainDO.getId());
+            onlinesettlementRecordDetailDO.setNumber(number);
+            onlinesettlementRecordDetailDO.setSupplierCode(item.getSupplierCode());
+            // 查询 供应商物品 赋值 供应商物品代码
+            onlinesettlementRecordDetailDO.setSupplierItemCode(supplieritemService.selectSupplierItemExist(item.getSupplierCode(),item.getItemCode()).getSupplierItemCode());
+            onlinesettlementRecordDetailDO.setId(null);
+            onlinesettlementRecordDetailDO.setCreator(null);
+            onlinesettlementRecordDetailDO.setCreateTime(null);
+            onlinesettlementRecordDetailDO.setUpdater(null);
+            onlinesettlementRecordDetailDO.setUpdateTime(null);
+            onlinesettlementRecordDetailDOList.add(onlinesettlementRecordDetailDO);
+        });
+        if(!onlinesettlementRecordDetailDOList.isEmpty()) {
+            onlinesettlementRecordDetailMapper.insertBatch(onlinesettlementRecordDetailDOList);
+        }
+    }
 }