简易模式收货及上架;

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -52,6 +52,10 @@ import com.mhd.wms.domain.stockInOrder.repository.vo.GwInDetail;
 import com.mhd.wms.domain.stockInOrder.repository.vo.GwStockInOrder;
 import com.mhd.wms.domain.stockInOrder.service.StockInOrderDomainService;
 import com.mhd.wms.domain.stockOutOrder.repository.mapper.StockOutOrderMapper;
+import com.mhd.wms.domain.stockReceiptOrder.service.StockReceiptOrderDomainService;
+import com.mhd.wms.domain.stockShelfOrder.entity.StockShelfOrder;
+import com.mhd.wms.domain.stockShelfOrder.repository.facade.IStockShelfOrderService;
+import com.mhd.wms.domain.stockShelfOrder.service.StockShelfOrderDomainService;
 import com.mhd.wms.interfaces.dto.stockInOrder.StockInOrderDTO;
 import com.mhd.wms.domain.stockOutOrder.entity.StockOutOrder;
 import com.mhd.wms.domain.stockOutOrder.repository.facade.IStockOutOrderService;
@@ -93,6 +97,10 @@ import java.util.stream.Collectors;
 public class StockInOrderApplicationService {
     @Autowired
     private StockInOrderDomainService stockInOrderDomainService;
+    @Autowired
+    private StockReceiptOrderDomainService stockReceiptOrderDomainService;
+    @Autowired
+    private StockShelfOrderDomainService stockShelfOrderDomainService;
     @Resource
     private UserServiceFeign userServiceFeign;
     @Resource
@@ -110,6 +118,8 @@ public class StockInOrderApplicationService {
     @Autowired
     private IStockReceiptOrderService stockReceiptOrderService;
     @Autowired
+    private IStockShelfOrderService stockShelfOrderService;
+    @Autowired
     private IReceiptMaterialDetailService receiptMaterialDetailService;
     @Autowired
     private IStockOutOrderService stockOutOrderService;
@@ -557,6 +567,19 @@ public class StockInOrderApplicationService {
         return b;
     }
 
+    public Boolean checkUploadEasyMode(StockInOrderDO stockInOrderDO){
+        String inOrderNumber = stockInOrderDO.getInOrderNumber();
+        StockReceiptOrder stockReceiptOrder = stockReceiptOrderService.getOne(new LambdaQueryWrapper<StockReceiptOrder>()
+                .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockReceiptOrder::getDelFlag, 1), false);
+        Boolean b = stockReceiptOrderDomainService.completeReceipt(stockReceiptOrder.getReceiptOrderId(), false);
+        StockShelfOrder stockShelfOrder = stockShelfOrderService.getOne(new LambdaQueryWrapper<StockShelfOrder>()
+                .eq(StockShelfOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockShelfOrder::getDelFlag, 1), false);
+        Boolean b1 = stockShelfOrderDomainService.completeUpShelf(stockShelfOrder.getShelfOrderId());
+        return b && b1;
+    }
+
 
     public void omsOrderAdd(StockInOrder stockInOrder){
         // 设置任务下发用户ID

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -238,6 +238,16 @@ public class StockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.shelfEasyMode(stockInOrderDO));
     }
 
+    /**
+     * 审核入库单
+     */
+    @ApiOperation("pda简易模式核对上传")
+    @PostMapping(value = "/checkUploadEasyMode")
+    public AjaxResult checkUploadEasyMode(@RequestBody StockInOrderDTO stockInOrderDTO) {
+        StockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
+        return AjaxResult.success(stockInOrderApplicationService.checkUploadEasyMode(stockInOrderDO));
+    }
+
     /**
      * oms下发单明细保存
      */

mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml

@@ -96,6 +96,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpCurrGw"    column="erp_curr_gw"    />
         <result property="erpPriceGw"    column="erp_price_gw"    />
         <result property="amountGw"    column="amount_gw"    />
+        <result property="shelfJson"    column="shelf_json"    />
+        <result property="collectQuantity"    column="collect_quantity"    />
     </resultMap>
 
 
@@ -109,7 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.lot_no ,
         a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id,
         a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity,
-        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,
+        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.SHELF_JSON,a.COLLECT_QUANTITY,
         CASE 
             WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL 
             ELSE CAST(a.pack_detail_id AS BIGINT)