增加 架子接收，成品入库查询

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

@@ -5,12 +5,15 @@ import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.wms.domain.bo.WmsReturnOrderBo;
 import org.dromara.wms.domain.vo.WmsOutstockRecordVo;
+import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
 import org.dromara.wms.service.IWmsPdaApiService;
 import org.dromara.wms.service.IWmsReturnOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/pda")
 public class WmsPdaApiController extends BaseController {
@@ -36,4 +39,17 @@ public class WmsPdaApiController extends BaseController {
         }
         return toAjax(result);
     }
+
+    @PostMapping("/product/bindVehicleSubmit")
+    public R<Void> bindVehicleSubmit(@RequestParam String vehicleCode,@RequestParam List<String> productList) {
+        // System.out.println(vehicleCode);
+        // System.out.println(productList.toString());
+
+        return R.ok();
+    }
+    @PostMapping("/product/selectVehicleInfo")
+    public R<WmsPsmInLoadVo> selectVehicleInfo(String code){
+        WmsPsmInLoadVo wmsPsmInLoadVo=apiService.productSelectVehicleInfo(code);
+        return R.ok();
+    }
 }

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

@@ -24,6 +24,7 @@ public class WmsPsmInLoad {
     /**
      * 表主键
      */
+    @TableId(value = "in_load_id", type = IdType.AUTO)
     private Long inLoadId;
 
     /**

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

@@ -23,55 +23,55 @@ public class WmsPsmInLoadBo extends BaseEntity {
     /**
      * 表主键
      */
-    @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "表主键不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long inLoadId;
 
     /**
      * 装车班次
      */
-    @NotNull(message = "装车班次不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "装车班次不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long loadShift;
 
     /**
      * 装车班组
      */
-    @NotNull(message = "装车班组不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "装车班组不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long loadClass;
 
     /**
      * 工装条码
      */
-    @NotBlank(message = "工装条码不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "工装条码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String toolingBarcode;
 
     /**
      * 仓库名称
      */
-    @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "仓库名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String storeName;
 
     /**
      * 库位条码
      */
-    @NotBlank(message = "库位条码不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "库位条码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String storePlaceCode;
 
     /**
      * 物料ID
      */
-    @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotNull(message = "物料ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long materialId;
 
     /**
      * 轮胎规格
      */
-    @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "轮胎规格不能为空", groups = { AddGroup.class, EditGroup.class })
     private String materialSpe;
 
     /**
      * 品级编号
      */
-    @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    // @NotBlank(message = "品级编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String checkGradeCode;
 
     /**

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

@@ -3,6 +3,7 @@ package org.dromara.wms.mapper;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.wms.domain.WmsPsmInLoad;
 import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
+import org.springframework.stereotype.Repository;
 
 /**
  * 装车架子信息Mapper接口
@@ -10,6 +11,7 @@ import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
  * @author LionLi
  * @date 2025-01-15
  */
+@Repository
 public interface WmsPsmInLoadMapper extends BaseMapperPlus<WmsPsmInLoad, WmsPsmInLoadVo> {
 
 }

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

@@ -1,9 +1,12 @@
 package org.dromara.wms.service;
 
 import org.dromara.wms.domain.vo.WmsOutstockRecordVo;
+import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
 
 public interface IWmsPdaApiService {
     WmsOutstockRecordVo returnSelectCode(String code);
 
     void rawReturnSubmitUpdateStateById(Long warehouseId);
+
+    WmsPsmInLoadVo productSelectVehicleInfo(String code);
 }

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

@@ -113,7 +113,7 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService {
      */
     @Override
     public Boolean insertByBo(WmsMoveOrderBo bo) {
-        String username = LoginHelper.getUsername();
+        // String username = LoginHelper.getUsername();
         //查询仓库现有的物料数量
         HashMap<String, List<WmsInventoryVo>> list = wmsInventoryService.selectInventorys(bo);
         List<WmsInventoryVo> planList = list.get("planList");//计划库位数据
@@ -142,7 +142,7 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService {
         int removeRows = wmsInventoryService.deletePlanList(ids);
         int rows = wmsInventoryService.updateWmsInventorys(updateList);
         WmsMoveOrder add = MapstructUtils.convert(bo, WmsMoveOrder.class);
-        add.setCreateBy(username);
+        // add.setCreateBy(username);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {

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

@@ -5,13 +5,12 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import io.github.linpeilie.BaseMapper;
 import org.dromara.common.core.utils.StringUtils;
-import org.dromara.wms.domain.BaseMaterialInfo;
+import org.dromara.wms.domain.*;
-import org.dromara.wms.domain.WmsBaseLocation;
-import org.dromara.wms.domain.WmsBaseWarehouse;
-import org.dromara.wms.domain.WmsOutstockRecord;
 import org.dromara.wms.domain.vo.WmsOutstockRecordVo;
+import org.dromara.wms.domain.vo.WmsPsmInLoadVo;
 import org.dromara.wms.mapper.WmsOutstockRecordMapper;
 import org.dromara.wms.mapper.WmsPdaApiMapper;
+import org.dromara.wms.mapper.WmsPsmInLoadMapper;
 import org.dromara.wms.service.IWmsPdaApiService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,10 +18,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
     @Autowired
-    private  WmsOutstockRecordMapper wmsOutstockRecordMapper;
+    private WmsOutstockRecordMapper wmsOutstockRecordMapper;
-@Autowired
+    @Autowired
-private WmsPdaApiMapper apiMapper;
+    private WmsPdaApiMapper apiMapper;
-
+    @Autowired
+    private WmsPsmInLoadMapper psmInLoadMapper;
 
     @Override
     public WmsOutstockRecordVo returnSelectCode(String code) {
@@ -31,7 +31,7 @@ private WmsPdaApiMapper apiMapper;
             .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec)
             .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId)
             .select(WmsBaseLocation::getWarehouseId)
-            .leftJoin(WmsBaseLocation.class,WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode)
+            .leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode)
             .eq(WmsOutstockRecord::getBatchCode, code)
             .eq(WmsOutstockRecord::getReturnFlag, 0)
             .orderByDesc(WmsOutstockRecord::getCreateTime);
@@ -43,4 +43,11 @@ private WmsPdaApiMapper apiMapper;
         apiMapper.rawReturnSubmitUpdateStateById(warehouseId);
 
     }
+
+    @Override
+    public WmsPsmInLoadVo productSelectVehicleInfo(String code) {
+        QueryWrapper<WmsPsmInLoad> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("toolingBarcode", code).eq("storePlaceCode",null);
+        return psmInLoadMapper.selectVoOne(queryWrapper);
+    }
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml

@@ -8,4 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="rawReturnSubmitUpdateStateById">
         update wms_outstock_record set return_flag= '1'    where outstock_record_id=#{warehouseId}
     </update>
+
+
 </mapper>