增加 物料质检入库

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java

@@ -11,6 +11,7 @@ import org.dromara.wms.service.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 @RequiredArgsConstructor
@@ -24,6 +25,7 @@ public class WmsPdaApiController extends BaseController {
     private final IWmsBaseLocationService baseLocationService;
     private final IWmsHppStorePlaceService wmsHppStorePlaceService;
     private final IWmsBaseAreaService baseAreaService;
+    private final IWmsInstockPrintService wmsInstockPrintService;
 
     /**
      * 原材料退库-现场扫描
@@ -77,7 +79,7 @@ public class WmsPdaApiController extends BaseController {
     public R<WmsInstockPrintVo> inSelectCode(String code, String type) {
         WmsInstockPrintVo wmsInstockPrintVo = apiService.inSelectCode(code);
         if (wmsInstockPrintVo == null) {
-            R.fail();
+            return R.fail("条码扫描错误");
         }
         // 推荐库位
         String locationCode = null;
@@ -89,7 +91,7 @@ public class WmsPdaApiController extends BaseController {
         return R.ok(wmsInstockPrintVo);
 
     }
-private final IWmsInstockPrintService wmsInstockPrintService;
+
     @PostMapping("/raw/inSubmit")
     public R<Void> inSubmit(@RequestBody WmsInstockPrintVo vo) {
 
@@ -105,20 +107,31 @@ private final IWmsInstockPrintService wmsInstockPrintService;
             if (wmsBaseArea == null || !wmsBaseArea.getAreaType().equals("9")) {
                 return R.fail("待检物料放入待检区域");
             }
-            WmsInstockPrintBo bo=new WmsInstockPrintBo();
+            WmsInstockPrintBo bo = new WmsInstockPrintBo();
             bo.setInstockPrintId(vo.getInstockPrintId());
             bo.setLocationId(vo.getLocationId());
+            bo.setInspectionType("1");
+            wmsInstockPrintService.updateByBo(bo);
+        } else if (vo.getTitle().equals("入库")) {
+            WmsInstockPrintBo bo = new WmsInstockPrintBo();
+            bo.setInstockPrintId(vo.getInstockPrintId());
+            bo.setLocationId(vo.getLocationId());
+            bo.setActualInboundTime(new Date());
+            bo.setInboundStatus("1");
             wmsInstockPrintService.updateByBo(bo);
-        }else if (vo.getTitle().equals("入库")){
             vo.setWarehouseId(wmsBaseLocationVo.getWarehouseId());
-        } else if (vo.getTitle().equals("AGV入库")){
-            vo.setLocationId(wmsBaseLocationVo.getWarehouseId());
+            Boolean result = apiService.inSubmit(vo);
+            return result ? R.ok() : R.fail();
+        } else if (vo.getTitle().equals("AGV入库")) {
+            WmsInstockPrintBo bo = new WmsInstockPrintBo();
+            bo.setInstockPrintId(vo.getInstockPrintId());
+            bo.setLocationId(vo.getLocationId());
+            bo.setInboundStatus("2");
+            bo.setAgvStatus("1");
+            wmsInstockPrintService.updateByBo(bo);
+            // vo.setLocationId(wmsBaseLocationVo.getWarehouseId());
         }
-
-
-
-        Boolean result = apiService.inSubmit(vo);
-        return result ? R.ok() : R.fail();
+        return R.ok();
     }
 
     /**

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsInstockPrint.java

@@ -148,6 +148,6 @@ public class WmsInstockPrint{
     @TableField(exist = false)
     private String materialCategoryName;//字段映射
 
-
+    private String inspectionType;
 
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsInstockPrintVo.java

@@ -157,6 +157,7 @@ public class WmsInstockPrintVo implements Serializable {
      * 质检要求(0必检,1免检)
      */
     private String inspectionRequest;
+    private String inspectionType;
 
     // PDA 操作标题
     private String title;

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsInstockPrintMapper.java

@@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface WmsInstockPrintMapper extends BaseMapperPlus<WmsInstockPrint, WmsInstockPrintVo> {
     @Select("select top 1 material_spe,batch_code,material_code,material_name,unit_name, " +
-        "             material_id,instock_print_id,apportion_qty,instock_code,material_qty " +
+        "             material_id,instock_print_id,apportion_qty,instock_code,material_qty,inspection_request,inspection_type " +
         "from wms_instock_print where batch_code=#{code}")
     WmsInstockPrintVo inSelectCode(String code);
 }

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java

@@ -209,6 +209,8 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
             // 插入库存
             WmsInventory inventory = new WmsInventory();
             BeanUtils.copyProperties(vo, inventory);
+            inventory.setWarehouseId(String.valueOf(vo.getWarehouseId()));
+            inventory.setStoreId(vo.getWarehouseId());
             inventory.setInventoryQty(BigDecimal.valueOf(vo.getInstockQty()));
             wmsInventoryMapper.insert(inventory);
         } else {