领用预验收库存不足，领用相关问题修改

src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java

@@ -59,6 +59,7 @@ import com.glxp.api.service.purchase.impl.PurOrderDetailService;
 import com.glxp.api.service.purchase.impl.PurPlanDetailService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
+import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import org.springframework.validation.BindingResult;
@@ -161,8 +162,8 @@ public class PurOrderReceiveController extends BaseController {
             filterReceiveRequest.setCreateUser(authAdmin.getId() + ""); //查询自己
         }
         if (filterReceiveRequest.getIsInvCode() != null && filterReceiveRequest.getIsInvCode()) {
-            AuthAdmin authAdmin = customerService.getUserBean();
-            filterReceiveRequest.setTargetInvCode(authAdmin.getLocInvCode());
+//            AuthAdmin authAdmin = customerService.getUserBean();
+            filterReceiveRequest.setTargetInvCode("1000000");
         }
 
         List<ReceiveResponse> data = receiveService.filterList(filterReceiveRequest);
@@ -260,7 +261,7 @@ public class PurOrderReceiveController extends BaseController {
             //寄售
             FilterInvPreProductRequest request = new FilterInvPreProductRequest();
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
-            request.setNameCode(updateReceiveDetailRequest.getNameCode());
+            request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
             list = selectFilterInvPreProductRequest(request);
 
@@ -268,20 +269,20 @@ public class PurOrderReceiveController extends BaseController {
             //预验收
             FilterInvPreinProductRequest request = new FilterInvPreinProductRequest();
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
-            request.setNameCode(updateReceiveDetailRequest.getNameCode());
+            request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
             listinvprein = selectfilterListStock(request);
 
         } else {
             FilterInvProductRequest request = new FilterInvProductRequest();
             // BeanUtils.copyProperties(updateReceiveDetailRequest,request);
-            request.setNameCode(updateReceiveDetailRequest.getNameCode());
+            request.setDiCode(updateReceiveDetailRequest.getNameCode());
             request.setInvCode(updateReceiveDetailRequest.getTargetInvCode());
             listInv = selectFilterInvProductRequest(request);
 
         }
         if (list != null && list.size() > 0) {
-            if (list.get(0).getReCount() < updateReceiveDetailRequest.getCount()) {
+            if (list.get(0).getReCount() < IntUtil.value(updateReceiveDetailRequest.getCount())) {
                 return ResultVOUtils.error(999, "库存不足！");
             }
         }

src/main/java/com/glxp/api/req/inv/FilterInvPreProductRequest.java

@@ -109,4 +109,6 @@ public class FilterInvPreProductRequest extends ListPageRequest {
      */
     private Integer filterCount;
 
+    private String diCode;
+
 }

src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java

@@ -110,4 +110,5 @@ public class FilterInvPreinProductRequest extends ListPageRequest {
      */
     private Integer filterCount;
 
+    private String diCode;
 }

src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java

@@ -114,4 +114,6 @@ public class FilterInvProductRequest extends ListPageRequest {
 
     private String manufactory;
 
+    private String diCode;
+
 }

src/main/resources/application-dev.yml

@@ -4,9 +4,9 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.242:3306/phxyy_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Glxp@6066
+    password: 123456
     hikari:
       connection-timeout: 60000
       maximum-pool-size: 20

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -83,6 +83,10 @@
             INNER JOIN auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         </if>
         <where>
+
+            <if test="name != '' and name != null">
+                AND auth_warehouse.name like concat('%', #{name}, '%')
+            </if>
             <if test="userId != '' and userId != null">
                 AND auth_warehouse_user.userId = #{userId}
             </if>

src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml

@@ -118,6 +118,9 @@
             <if test="nameCode != null and nameCode != ''">
                 AND ipp.nameCode like concat('%', #{nameCode}, '%')
             </if>
+            <if test="diCode != null and diCode != ''">
+                AND ipp.nameCode = #{diCode}
+            </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}
             </if>

src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml

@@ -116,6 +116,9 @@
             <if test="nameCode != null and nameCode != ''">
                 AND ipp.nameCode like concat('%', #{nameCode}, '%')
             </if>
+            <if test="diCode != null and diCode != ''">
+                AND ipp.nameCode = #{diCode}
+            </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ipp.relIdFk = #{relIdFk}
             </if>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -155,7 +155,7 @@
                bp.ggxh,
                ip.batchNo,
                ip.code,
-               ip.produceDate productionDate,
+               ip.produceDate  productionDate,
                ip.expireDate,
                ip.serialNo,
                basic_corp.NAME supName,
@@ -297,7 +297,7 @@
     </select>
 
     <select id="filterProductNames" resultType="com.glxp.api.res.inv.InvProductResponse">
-        select ip.relIdFk, bp.cpmctymc, bp.ggxh,bp.ylqxzcrbarmc,bp.zczbhhzbapzbh
+        select ip.relIdFk, bp.cpmctymc, bp.ggxh, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh
         from inv_product ip
                      left join inv_product_detail ipd on ip.relIdFk = ipd.relId and ip.invCode = ipd.invCode and
                                                          ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
@@ -443,6 +443,9 @@
             <if test="nameCode != null and nameCode != ''">
                 AND ip.nameCode like concat('%', #{nameCode}, '%')
             </if>
+            <if test="diCode != null and diCode != ''">
+                AND ip.nameCode = #{diCode}
+            </if>
             <if test="relIdFk != null and relIdFk != ''">
                 AND ip.relIdFk = #{relIdFk}
             </if>