不包含取消发货

src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java

@@ -62,6 +62,8 @@ public interface CoDelMapper {
 
     void updateEcssDelDetailSurplusQty(EcssCoDelNotifyHeaderData data);
 
+    void restoreEcssDelDetailSurplusQty(EcssCoDelNotifyHeaderData data);
+
     void updateEcssDelDetailStatus(EcssCoDelNotifyHeaderData data);
     void recoverEcssDelDetailStatus(EcssCoDelNotifyHeaderData data);
 

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java

@@ -296,6 +296,11 @@ public class CoDelServiceImpl implements CoDelService {
         coDelMapper.updateEcssDelHeaderForModify(header);
         // 改单导入后的状态处理逻辑 - 删除发货涉及PN/Qty变化（删除PN）
         handleNotifyStatusAfterModify(checkHeader.get(0), true);
+        // 装箱数据全部删除，恢复该发货通知单下所有有效明细的剩余数量，以便重新装箱
+        EcssCoDelNotifyHeaderData restoreData = new EcssCoDelNotifyHeaderData();
+        restoreData.setSite(data.getSite());
+        restoreData.setDelNo(data.getDelNo());
+        coDelMapper.restoreEcssDelDetailSurplusQty(restoreData);
         // 改单取消某条订单 通知仓库和单证人员
         //设置邮件内容
         String text = "<!DOCTYPE>" + "<div>发货通知单" +data.getDelNo()+"【发票："+ data.getCmcInvoice()+"】改单" + "</div>"+

src/main/resources/mapper/ecss/CoDelMapper.xml

@@ -277,6 +277,11 @@
         update ecss_CoDelNotifyDetail set surplus_qty=0 where site=#{site} and delNo=#{delNo}
     </update>
 
+    <update id="restoreEcssDelDetailSurplusQty" >
+        update ecss_CoDelNotifyDetail set surplus_qty=qty
+        where site=#{site} and delNo=#{delNo} and status != '取消发货'
+    </update>
+
     <update id="changeEcssDelStatus">
         update ecss_CoDelNotifyHeader set notify_status=#{notifyStatus},walMartOrderFlag=#{walMartOrderFlag},
                                           fscFlag=#{fscFlag},boxSizeFlag=#{boxSizeFlag} where site=#{site} and delNo=#{delNo}
@@ -881,7 +886,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
 
     <select id="exportDeclarationDetail" resultType="java.util.Map">
         select detail.site,detail.declaration_no,detail.item_no,
-               CONVERT(DECIMAL(20, 0), detail.qty) as qty,isnull(h.unit,'') as qty_unit,'kg' as weight_unit,
+               CONVERT(DECIMAL(20, 6), detail.qty) as qty,isnull(h.unit,'') as qty_unit,'kg' as weight_unit,
                CONVERT(DECIMAL(20, 2),detail.net_weight) as net_weight,CONVERT(DECIMAL(20, 6),detail.unit_price) as unit_price,
                CONVERT(DECIMAL(20, 2),detail.total_price) as total_price,detail.currency,detail.made_area,detail.destination,
                detail.source_area,detail.levy,detail.hs_code,detail.hs_code_desc,h.hsCodeDescEn

src/main/resources/mapper/ecss/EcssCommonMapper.xml

@@ -141,6 +141,7 @@
 		<where>
 			And a.site = #{site}
 			AND a.delNo = #{delNo}
+			and a.status != '取消发货'
 		</where>
 		order by a.item_no
 	</select>