修改 半制品入库提交

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

@@ -183,7 +183,7 @@ public class WmsPdaApiController extends BaseController {
     public R<WmsHppInStockDetailVo> semiSelectVehicleInfo(String code) {
         WmsHppInStockDetailVo wmsHppInStockDetailVo = apiService.semiSelectVehicleInfo(code);
         if (wmsHppInStockDetailVo == null) {
-            return R.fail("载具没有绑定物料，或者载具编码扫描错误");
+            return R.fail("流转卡号扫描错误");
         }
         return R.ok(wmsHppInStockDetailVo);
     }

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

@@ -1,9 +1,9 @@
 package org.dromara.wms.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -95,5 +95,6 @@ public class WmsHppInStockDetail{
     @TableField(exist = false)
     private String storePlaceCode;
 
+    private String unitName;
 
 }

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

@@ -1,6 +1,5 @@
 package org.dromara.wms.mapper;
 
-import org.apache.ibatis.annotations.Select;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.wms.domain.WmsHppInStockDetail;
 import org.dromara.wms.domain.vo.WmsHppInStockDetailVo;
@@ -14,9 +13,9 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WmsHppInStockDetailMapper extends BaseMapperPlus<WmsHppInStockDetail, WmsHppInStockDetailVo> {
-    @Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" +
-        "             material_id,material_spec,instock_num,material_code,unit_name\n" +
-        "from wms_hpp_in_stock_detail where store_place_id is null and  shelf_no=#{code}\n" +
-        "order by create_time")
+    // @Select("select top 1 obj_id,create_time,card_no,shelf_no, grade_code,product_category,\n" +
+    //     "             material_id,material_spec,instock_num,material_code,unit_name\n" +
+    //     "from wms_hpp_in_stock_detail where store_place_id is null and  shelf_no=#{code}\n" +
+    //     "order by create_time")
     WmsHppInStockDetailVo semiSelectVehicleInfo(String code);
 }

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

@@ -8,6 +8,7 @@ import com.github.yulichang.toolkit.JoinWrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.wms.domain.*;
@@ -26,7 +27,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     private final WmsOutstockRecordMapper wmsOutstockRecordMapper;
     private final WmsPdaApiMapper apiMapper;
-    private final WmsHppInStockDetailMapper baseMapper;
+
     private final WmsPsmInStockMapper wmsPsmInStockMapper;
     private final WmsPsmInLoadDetailMapper wmsPsmInLoadDetailMapper;
     private final WmsInventoryCheckRecordMapper wmsInventoryCheckRecordMapper;
@@ -105,17 +106,21 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     @Override
     public WmsHppInStockDetailVo semiSelectVehicleInfo(String code) {
-        return baseMapper.semiSelectVehicleInfo(code);
+        return hppInStockDetailMapper.semiSelectVehicleInfo(code);
     }
 
     @Override
     public Boolean updataInStoreRecord(WmsHppInStockDetailVo vo) {
-        LambdaUpdateWrapper<WmsHppInStockDetail> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId())
-            .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId())
-            .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime())
-            .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername());
-        int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper);
+        // LambdaUpdateWrapper<WmsHppInStockDetail> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        // lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId())
+        //     .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId())
+        //     .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime())
+        //     .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername());
+        // int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper);
+
+        WmsHppInStockDetail convert = MapstructUtils.convert(vo, WmsHppInStockDetail.class);
+
+        int rows = hppInStockDetailMapper.insert(convert);
         if (rows > 0) {
             // System.out.println("更新成功");
             WmsHppStorageDetail hppStorageDetail = new WmsHppStorageDetail();

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

@@ -1,7 +1,30 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.wms.mapper.WmsHppInStockDetailMapper">
 
+    <resultMap id="hpp" type="org.dromara.wms.domain.vo.WmsHppInStockDetailVo">
+        <result property="materialCode" column="material_code"/>
+        <result property="materialId" column="material_id"/>
+        <result property="materialSpec" column="material_spec"/>
+        <result property="cardNo" column="return_barcode"/>
+        <result property="instockNum" column="complete_amount"/>
+        <result property="unitName" column="unit_name"/>
+    </resultMap>
+
+    <select id="semiSelectVehicleInfo" resultMap="hpp">
+        select top 1
+                complete_amount,
+                return_barcode,
+               prod.material_id,
+               base.material_spec,
+               base.material_code,
+               unit_name,
+               shift_id,
+               class_team_id
+        from prod_product_plan_detail_2 prod
+                 left join base_material_info base on prod.material_id = base.material_id
+        where return_barcode=#{code}
+    </select>
 </mapper>