三单派单批量派单bug

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxPmqManagementRecoredDao.java

@@ -64,4 +64,12 @@ public interface ZhcxPmqManagementRecoredDao extends BaseMapper<ZhcxPmqManagemen
      * @param ids Distribution_detail表的id集合
      */
     void deleteDistributionDetailById(@Param("ids") List<String> ids);
+
+    /**
+     * 根据pid+机号 去删除第2.5,3层的数据
+     * @param pid  recored表id
+     * @param machineid 机号id
+     */
+    void deleteDistributionByPIdAndMachineid(@Param("pid")String pid, @Param("machineid") String machineid);
+    void deleteDistributionDetailByPIdAndMachineid(@Param("pid")String pid,@Param("machineid")String machineid);
 }

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxPmqManagementRecoredServiceImpl.java

@@ -625,6 +625,10 @@ public class ZhcxPmqManagementRecoredServiceImpl extends ServiceImpl<ZhcxPmqMana
                     baseMapper.deleteDistributionById(idList);
                     baseMapper.deleteDistributionDetailById(idList);
                 }
+                // 删除第2.5层 第三层数据
+                //baseMapper.deleteDistributionByPIdAndMachineid(pid,zhcxPmqManagementDistributionDTO.getMachineid());
+                //baseMapper.deleteDistributionDetailByPIdAndMachineid(pid,zhcxPmqManagementDistributionDTO.getMachineid());
+
                 // 第2.5层数据
                 result.setId(distributionId);
                 result.setPid(pid);

business-common/src/main/resources/mybatis/business/ZhcxPmqManagementRecoredDao.xml

@@ -108,7 +108,7 @@
         INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION
         SET
         DELETED ='1',REMARK='批量派单删除'
-        WHERE PID in
+        WHERE DELETED ='0' and ID in
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
@@ -119,9 +119,27 @@
         INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION_DETAIL
         SET
         DELETED ='1',REMARK='批量派单删除'
-        WHERE PID in
+        WHERE DELETED ='0' and ID in
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>
     </update>
+
+    <update id="deleteDistributionByPIdAndMachineid">
+        UPDATE
+            INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION
+        SET
+            DELETED ='1',REMARK='批量派单删除'
+        where
+            PID = #{pid} and MACHINEID = #{machineid}
+    </update>
+
+    <update id="deleteDistributionDetailByPIdAndMachineid">
+        UPDATE
+            INCONTROL.ZHCX_PMQ_MANAGEMENT_DISTRIBUTION_DETAIL
+        SET
+            DELETED ='1',REMARK='批量派单删除'
+        where
+            PID = #{pid} and MACHINEID = #{machineid}
+    </update>
 </mapper>