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

src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java

@@ -87,6 +87,7 @@ public class IdcServiceImpl implements IdcService {
     private ScheduledDao scheduledDao;
 
     private String imagePath = FileConstant.COMMON_FILE_PATH;
+
     /*获取拉取任务列表*/
     @Override
     public BaseResponse taskList(HttpServletRequest request, Map<String, Object> params) {
@@ -245,8 +246,7 @@ public class IdcServiceImpl implements IdcService {
 
     /*上传失败重新上传*/
     private void asyncFailTask(String host) {
-        try
+        try {
-        {
             String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
             String sql = "select * from basic_export_status where status='1' and receiveStatus='0' where updateTime<date_sub(now(),interval 6 minute) order by updateTime";
             Map<String, Object> map = new HashMap<String, Object>();
@@ -1208,8 +1208,7 @@ public class IdcServiceImpl implements IdcService {
                     }
 
                 } catch (Exception e) {
-
+                    e.printStackTrace();
-
                 }
             }
             if (!(total > 0)) {
@@ -1357,8 +1356,6 @@ public class IdcServiceImpl implements IdcService {
     }
 
 
-
-
     /*把列数据转Map*/
     private Map<String, Object> getColumn(String tableName) {
         Map<String, Object> map = new HashMap<String, Object>();
@@ -1465,6 +1462,7 @@ public class IdcServiceImpl implements IdcService {
 
         }
     }
+
     private void writeFile(byte[] file, String filePath, String fileName) throws Exception {
         File targetFile = new File(filePath);
         if (!targetFile.exists()) {

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

@@ -104,6 +104,8 @@ public class HeartService {
     @Resource
     IoOrderInvoiceService orderInvoiceService;
 
+    @Resource
+    IoOrderInvoiceMapper ioOrderInvoiceMapper;
     private final ApplicationContext applicationContext;
 
     //上传最近更新扫码单据
@@ -1396,6 +1398,7 @@ public class HeartService {
                             String fileFullPath = writeFile(filePrefix, NEW_ALL_ORDER, response.getData());
                             basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
                         } catch (IOException e) {
+                            e.printStackTrace();
                             throw new RuntimeException(e);
                         }
 
@@ -1625,8 +1628,6 @@ public class HeartService {
 
     private final IoCodeLostMapper ioCodeLostMapper;
     private final IoCodeRelMapper ioCodeRelMapper;
-    @Resource
-    private final IoOrderInvoiceMapper ioOrderInvoiceMapper;
 
     /**
      * 设置嵌套事物
@@ -1902,7 +1903,7 @@ public class HeartService {
             List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
             for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                 if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    orderInvoiceService.insertInvoice(orderInvoiceEntity);
+                    ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
                 }
             }
         }

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

@@ -230,8 +230,7 @@
     </select>
 
     <select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
-        SELECT
+        SELECT t1.nameCode,
-            t1.nameCode,
                t1.relId,
                (SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode)          AS deptName,
                (SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode) AS invName,
@@ -247,8 +246,7 @@
                bp.ylqxzcrbarmc,
                bp.manufactory,
                (SELECT `name` FROM basic_corp WHERE erpId = t1.supId)                        supName
-        FROM
+        FROM inv_prein_product_detail t1
-            inv_prein_product_detail t1
                      LEFT JOIN basic_udirel bu ON bu.id = t1.relId
                      LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
         <where>
@@ -261,8 +259,7 @@
                 AND t1.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
-        GROUP BY
+        GROUP BY CODE,
-            CODE,
                  invSpaceCode
     </select>
 
@@ -285,9 +282,9 @@
                ad.name                        deptName,
                aw.name                        invName,
                sp.name                        invSpaceName,
-               sum(pd.inCount)  as inCount,
+               ifnull(sum(pd.inCount), 0)  as inCount,
-               sum(pd.outCount) as outCount,
+               ifnull(sum(pd.outCount), 0) as outCount,
-               sum(pd.reCount)  as reCount
+        pd.inCount - pd.outCount  as reCount
         from inv_prein_product_detail pd
                      left join basic_udirel bu on pd.relId = bu.id
                      left join basic_products bp on bp.uuid = bu.uuid

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

@@ -223,18 +223,14 @@
     </select>
 
     <select id="getInventoryQuantity" resultType="Integer">
-
         SELECT ifnull(SUM(inCount), 0) - ifnull(SUM(outCount), 0)
-        FROM
+        FROM inv_pre_product_detail ipd
-            inv_pre_product_detail ipd
+        WHERE CODE = #{code}
-        WHERE
-            CODE = #{code}
           and (invSpaceCode is null or invSpaceCode = '')
     </select>
 
     <select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
-        SELECT
+        SELECT t1.nameCode,
-        t1.nameCode,
                t1.relId,
                (SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode)          AS deptName,
                (SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode) AS invName,
@@ -250,8 +246,7 @@
                bp.ylqxzcrbarmc,
                bp.manufactory,
                (SELECT `name` FROM basic_corp WHERE erpId = t1.supId)                        supName
-        FROM
+        FROM inv_pre_product_detail t1
-        inv_pre_product_detail t1
                      LEFT JOIN basic_udirel bu ON bu.id = t1.relId
                      LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
         <where>
@@ -262,8 +257,7 @@
                 AND t1.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
-        GROUP BY
+        GROUP BY CODE,
-        CODE,
                  invSpaceCode
     </select>
 
@@ -286,9 +280,9 @@
                ad.name                        deptName,
                aw.name                        invName,
                sp.name                        invSpaceName,
-        sum(pd.inCount)  as inCount,
+               ifnull(sum(pd.inCount), 0)  as inCount,
-        sum(pd.outCount) as outCount,
+               ifnull(sum(pd.outCount), 0) as outCount,
-        sum(pd.reCount)  as reCount
+               pd.inCount - pd.outCount    as reCount
         from inv_pre_product_detail pd
                      left join basic_udirel bu on pd.relId = bu.id
                      left join basic_products bp on bp.uuid = bu.uuid

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

@@ -14,9 +14,9 @@
                ipp.expireDate,
                bp.ylqxzcrbarmc,
                bp.zczbhhzbapzbh,
-               sum(ipp.inCount) as inCount,
+               ifnull(sum(ipp.inCount), 0)  as inCount,
-               sum(ipp.outCount) as outCount,
+               ifnull(sum(ipp.outCount), 0) as outCount,
-               sum(ipp.reCount) as reCount,
+               ipp.inCount - ipp.outCount   as reCount,
                basic_corp.name                 supName,
                ipp.supId,
                auth_dept.name                  deptName,
@@ -345,18 +345,14 @@
     </select>
 
     <select id="getInventoryQuantity" resultType="Integer">
-
         SELECT ifnull(SUM(inCount), 0) - ifnull(SUM(outCount), 0)
-        FROM
+        FROM inv_product_detail ipd
-            inv_product_detail ipd
+        WHERE CODE = #{code}
-        WHERE
-            CODE = #{code}
           and (invSpaceCode is null or invSpaceCode = '')
     </select>
 
     <select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
-        SELECT
+        SELECT t1.nameCode,
-        t1.nameCode,
                t1.relId,
                (SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode)          AS deptName,
                (SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode) AS invName,
@@ -372,8 +368,7 @@
                bp.ylqxzcrbarmc,
                bp.manufactory,
                (SELECT `name` FROM basic_corp WHERE erpId = t1.supId)                        supName
-        FROM
+        FROM inv_product_detail t1
-        inv_product_detail t1
                      LEFT JOIN basic_udirel bu ON bu.id = t1.relId
                      LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
         <where>
@@ -384,8 +379,7 @@
                 AND t1.invSpaceCode = #{invSpaceCode}
             </if>
         </where>
-        GROUP BY
+        GROUP BY CODE,
-        CODE,
                  invSpaceCode
     </select>
 </mapper>