增加 半成品盘点改表

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

@@ -267,15 +267,15 @@ public class WmsPdaApiController extends BaseController {
     }
 
     @PostMapping("/storeCheck/submitOrder")
-    public R<WmsInventoryCheck> storeCheckSubmitOrder(@RequestParam("storeId") Long storeId,@RequestParam("location") List<String> list) {
+    public R<WmsInventoryCheck> storeCheckSubmitOrder(@RequestParam("storeId") Long storeId,@RequestParam("type") String type,@RequestParam("location") List<String> list) {
-        WmsInventoryCheck wmsInventoryCheck=  apiService.storeCheckSubmitOrder(storeId,list);
+        WmsInventoryCheck wmsInventoryCheck=  apiService.storeCheckSubmitOrder(type,storeId,list);
 
         return R.ok(wmsInventoryCheck);
     }
     // 根据库位查询库存
     @PostMapping("/storeCheck/selectInventory")
-    public R< List<WmsInventoryVo>> storeCheckSelectInventory(String locationCode) {
+    public R< List<WmsInventoryVo>> storeCheckSelectInventory(String locationCode,String type) {
-        List<WmsInventoryVo> list=apiService.storeCheckSelectInventory(locationCode);
+        List<WmsInventoryVo> list=apiService.storeCheckSelectInventory(locationCode,type);
         if (list == null || list.isEmpty()) {
             return R.fail();
         }

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

@@ -1,5 +1,6 @@
 package org.dromara.wms.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.wms.domain.WmsInventoryCheck;
@@ -14,6 +15,8 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface WmsInventoryCheckMapper extends BaseMapperPlus<WmsInventoryCheck, WmsInventoryCheckVo> {
-    @Select("select top 1 check_code from wms_inventory_check where DateDiff(dd,create_time,getdate())=0 order by create_time desc")
+    @Select("select top 1 check_code FROM ${tabName} where DateDiff(dd,create_time,getdate())=0 order by create_time desc")
-    WmsInventoryCheck selectInventoryCheckOrder();
+    WmsInventoryCheck selectInventoryCheckOrder(@Param("tabName")String tabName);
+
+    int insertTable(@Param("tabName") String tabName, @Param("check") WmsInventoryCheck insert);
 }

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

@@ -45,9 +45,9 @@ public interface IWmsPdaApiService {
     List<WmsBaseLocationVo> storeCheckSelectLocation(String type, Long storeId);
 
 
-    WmsInventoryCheck storeCheckSubmitOrder(Long storeId, List<String> list);
+    WmsInventoryCheck storeCheckSubmitOrder(String type, Long storeId, List<String> list);
 
-    List<WmsInventoryVo> storeCheckSelectInventory(String locationCode);
+    List<WmsInventoryVo> storeCheckSelectInventory(String locationCode, String type);
 
     Boolean storeCheckSubmitCheckRecord(WmsInventoryCheckRecord wmsInventoryCheckRecord);
 

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

@@ -282,9 +282,16 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     // 查询盘点工单
     @Override
-    public WmsInventoryCheck storeCheckSubmitOrder(Long storeId, List<String> list) {
+    public WmsInventoryCheck storeCheckSubmitOrder(String type, Long storeId, List<String> list) {
         String tag = DateUtils.dateTime();
-        WmsInventoryCheck wmsInventoryCheck = wmsInventoryCheckMapper.selectInventoryCheckOrder();
+        String tabName=null;
+        if (type.equals("原材料盘点")) {
+            tabName="wms_inventory_check";
+        }else if (type.equals("半成品盘点")){
+            tabName="wms_inventory_check_2";
+        }
+
+        WmsInventoryCheck wmsInventoryCheck = wmsInventoryCheckMapper.selectInventoryCheckOrder(tabName);
         WmsInventoryCheck insert = new WmsInventoryCheck();
         if (wmsInventoryCheck == null) {
             insert.setCheckCode("PD" + tag + "001");
@@ -297,12 +304,13 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
         }
         insert.setPlanWarehouseId(storeId);
         insert.setCreateBy(LoginHelper.getUserId());
-        wmsInventoryCheckMapper.insert(insert);
+        insert.setTenantId(LoginHelper.getTenantId());
+        wmsInventoryCheckMapper.insertTable(tabName,insert);
         return insert;
     }
 
     @Override
-    public List<WmsInventoryVo> storeCheckSelectInventory(String locationCode) {
+    public List<WmsInventoryVo> storeCheckSelectInventory(String locationCode, String type) {
         MPJLambdaWrapper<WmsInventory> lqw = JoinWrappers.lambda(WmsInventory.class);
         lqw.eq(WmsInventory::getLocationCode, locationCode);
         return wmsInventoryMapper.selectVoList(lqw);

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

@@ -3,5 +3,8 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.dromara.wms.mapper.WmsInventoryCheckMapper">
-
+        <insert id="insertTable" parameterType="org.dromara.wms.domain.WmsInventoryCheck">
+            INSERT INTO ${tabName} (check_code, plan_warehouse_id, create_by, create_time, tenant_id)
+            VALUES (#{check.checkCode},  #{check.planWarehouseId},#{check.createBy},  getdate(), #{check.tenantId})
+        </insert>
 </mapper>