Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -18,6 +18,7 @@ import com.glxp.api.entity.auth.InvWarehouseEntity;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.EntrustReceEntity;
 import com.glxp.api.entity.inout.*;
+import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.auth.FilterInvBusUserRequest;
 import com.glxp.api.req.basic.BasicEntrustRecRequest;
 import com.glxp.api.req.inout.*;
@@ -34,6 +35,7 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -644,10 +646,22 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    SpGetHttpClient spGetHttpClient;
+
     @PostMapping("/udiwms/inout/order/updateOrder")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse updateOrder(@RequestBody IoOrderEntity ioOrderEntity) {
+
+        ioOrderEntity.setUpdateTime(new Date());
         orderService.updateByBillNo(ioOrderEntity);
+
+        if (IntUtil.value(ioOrderEntity.getCheckStatus()) != 0) {
+            IoOrderEntity orderEntity = new IoOrderEntity();
+            orderEntity.setBillNo(ioOrderEntity.getBillNo());
+            orderEntity.setCheckStatus(1);
+            spGetHttpClient.updateCheckStatus(orderEntity, getUserId() + "");
+        }
         return ResultVOUtils.success();
     }
 

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -162,6 +162,22 @@ public class SpGetHttpClient {
         return response;
     }
 
+    //确认自助平台单据--直连接口
+    public BaseResponse<String> updateCheckStatus(IoOrderEntity orderEntity, String userId) {
+
+
+        List<String> header = (List<String>) Convert.toList(buildHeader());
+        header.add("ADMIN_ID");
+        header.add(userId);
+
+        String json = JSONUtil.toJsonStr(orderEntity);
+        String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/updateOrder", json, Convert.toStrArray(header));
+        BaseResponse<String> response =
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<String>>() {
+                });
+        return response;
+    }
+
 
     //    最小销售标识获取国家库信息
     public BaseResponse<PageSimpleResponse<ProductInfoEntity>> getSyncDi(ProductInfoFilterRequest productInfoFilterRequest) {

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -168,8 +168,6 @@ public class HeartService {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-
-
         basicExportService.updateExportStatus(basicExportStatusEntity1);
         return ResultVOUtils.success();
     }

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,31 +3,31 @@
 <mapper namespace="com.glxp.api.dao.inv.InvPreinProductDao">
     <select id="filterList" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
         select ipp.id,
-        ipp.nameCode,
-        bp.cpmctymc,
-        ipp.relIdFk,
-        bp.ggxh,
-        ipp.batchNo,
-        ipp.productionDate,
-        ipp.expireDate,
-        bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
-        ipp.inCount,
-        ipp.outCount,
-        ipp.reCount,
-        ipp.customerId,
-        basic_corp.name     supName,
-        ipp.supId,
-        auth_dept.name      deptName,
-        auth_warehouse.name invName,
-        ipp.deptCode,
-        ipp.invCode
+               ipp.nameCode,
+               bp.cpmctymc,
+               ipp.relIdFk,
+               bp.ggxh,
+               ipp.batchNo,
+               ipp.productionDate,
+               ipp.expireDate,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               ipp.inCount,
+               ipp.outCount,
+               ipp.reCount,
+               ipp.customerId,
+               basic_corp.name     supName,
+               ipp.supId,
+               auth_dept.name      deptName,
+               auth_warehouse.name invName,
+               ipp.deptCode,
+               ipp.invCode
         from inv_prein_product ipp
-        inner join basic_udirel on ipp.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
@@ -75,16 +75,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_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">
@@ -215,5 +216,4 @@
         GROUP BY ipp.relId, ipp.batchNo
         order by ipp.updateTime desc
     </select>
-
 </mapper>

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

@@ -85,7 +85,7 @@
                 </foreach>
             </if>
         </where>
-        GROUP BY ip.relIdFk, ip.batchNo
+        GROUP BY ip.relIdFk, ip.batchNo, ip.supId
         order by ip.updateTime desc
     </select>