库存查询

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -16,10 +16,7 @@ import com.glxp.api.entity.inv.InvProductEntity;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
-import com.glxp.api.req.basic.UdiCombineRequest;
+import com.glxp.api.req.basic.*;
-import com.glxp.api.req.basic.FilterUdiRelRequest;
-import com.glxp.api.req.basic.LockUdiRequest;
-import com.glxp.api.req.basic.UdiRelevanceSaveRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -52,8 +49,6 @@ import java.util.List;
 
 @RestController
 public class UdiRelevanceController extends BaseController {
-    @Resource
-    GennerOrderUtils gennerOrderUtils;
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
@@ -70,6 +65,8 @@ public class UdiRelevanceController extends BaseController {
     ThrDataService thrDataService;
     @Resource
     UdiRlSupService udiRlSupService;
+    @Resource
+    ProductInfoService productInfoService;
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -698,4 +695,16 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(ggxhList);
     }
 
+    //国家库uuid获取产品
+    @PostMapping("/udi/udirel/selectOriginuuid")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
+    public BaseResponse selectOriginuuid(@RequestBody ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ProductInfoEntity> udiProductEntities = productInfoService.findAll(productInfoFilterRequest);
+        return ResultVOUtils.success(udiProductEntities);
+    }
+
 }

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

@@ -77,6 +77,7 @@
                 </foreach>
             </if>
         </where>
+        group by ipp.id
     </select>
 
     <select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreProductEntity">

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

@@ -3,32 +3,32 @@
 <mapper namespace="com.glxp.api.dao.inv.InvPreinProductDao">
     <select id="filterList" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
         select ipp.id,
-        ipp.nameCode,
+               ipp.nameCode,
-        bp.cpmctymc,
+               bp.cpmctymc,
-        ipp.relIdFk,
+               ipp.relIdFk,
-        bp.ggxh,
+               bp.ggxh,
-        ipp.batchNo,
+               ipp.batchNo,
-        ipp.productionDate,
+               ipp.productionDate,
-        ipp.expireDate,
+               ipp.expireDate,
-        bp.ylqxzcrbarmc,
+               bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        ipp.inCount,
+               ipp.inCount,
-        ipp.outCount,
+               ipp.outCount,
-        ipp.reCount,
+               ipp.reCount,
-        ipp.customerId,
+               ipp.customerId,
-        basic_corp.name     supName,
+               basic_corp.name     supName,
-        ipp.supId,
+               ipp.supId,
-        auth_dept.name      deptName,
+               auth_dept.name      deptName,
-        auth_warehouse.name invName,
+               auth_warehouse.name invName,
-        ipp.deptCode,
+               ipp.deptCode,
-        ipp.invCode,
+               ipp.invCode,
-        bp.measname
+               bp.measname
         from inv_prein_product ipp
-        inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
@@ -76,16 +76,17 @@
                 </foreach>
             </if>
         </where>
+        group by ipp.id
     </select>
 
     <select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreinProductEntity">
         select ipp.*
         from inv_prein_product ipp
-        inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">