1.修复无法删除盘点单据问题

2.修复分库列表查询接口重复数据问题

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvCountOrderDao.java

@@ -65,4 +65,11 @@ public interface InvCountOrderDao {
      * @return
      */
     InvCountOrder selectByOrderId(@Param("orderId") String orderId);
+
+    /**
+     * 根据单据号删除单据
+     *
+     * @param orderId
+     */
+    void deleteByOrderId(@Param("orderId") String orderId);
 }

api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvCountOrderServiceImpl.java

@@ -88,9 +88,15 @@ public class InvCountOrderServiceImpl implements InvCountOrderService {
     @Override
     public void deleteOrder(String id) {
         String orderId = invCountOrderDao.selectOrderIdById(id);
-        invCountOrderDao.deleteByPrimaryKey(Integer.valueOf(id));
+        log.info("开始删除盘点单据，盘点单号： {}", orderId);
-        invCountOrderDetailDao.deleteByOrderId(orderId);
+        invCountOrderDao.deleteByOrderId(orderId);
-        invCountCodesDao.deleteByOrderId(orderId);
+        if (invCountOrderDetailDao.countByOrderIdFk(orderId) > 0) {
+            invCountOrderDetailDao.deleteByOrderId(orderId);
+        }
+        if (invCountCodesDao.countByOrderIdFk(orderId) > 0) {
+            invCountCodesDao.deleteByOrderId(orderId);
+        }
+        log.info("盘点单据删除完成");
     }
 
     @Override

api-admin/src/main/resources/mybatis/mapper/inventory/InvCountOrderDao.xml

@@ -414,4 +414,9 @@
         from inv_count_order
         where orderId = #{orderId}
     </select>
+
+    <delete id="deleteByOrderId">
+        delete from inv_count_order
+        where orderId = #{orderId}
+    </delete>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml

@@ -255,5 +255,6 @@
                 AND a.parentId = #{pcode}
             </if>
         </where>
+        GROUP BY a.code
     </select>
 </mapper>

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -3,10 +3,11 @@
 CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork ('pur_plan','billType','varchar(255) ', 2);
 
 
-INSERT ignore INTO sys_scheduled (`cronName`, `cron`, `customerId`, `remark`) VALUES ('downloadSpDataTask', '0 0/1 * * * ?', NULL, '立即下载自助平台数据');
+ALTER TABLE pur_plan
-
+    MODIFY COLUMN `billType` varchar(255) NULL DEFAULT NULL COMMENT '申购类型' AFTER `status`;
 
 -- 创建表时必须  create table if not exists 表名