BUG调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/seclarationElements/mapper/xml/SyDeclarationElementsMapper.xml

@@ -12,42 +12,49 @@
     </select>
 
     <update id="updateAssembledPacking">
-        update sy_pre_assembled_packing_list
-        set elements_id = #{newElmentId}
-        where elements_id = #{elmentId} and del_flag = '0'
-
+        update sy_pre_assembled_packing_list a
+        left join sy_pre_assembled_packing b
+        on a.sy_pre_assembled_packing_list_id = b.id
+        set a.elements_id = #{newElmentId}
+        where a.elements_id = #{elmentId} and a.del_flag = '0' and b.push_status ='0'
 
     </update>
 
     <update id="updateFabric">
-        update sy_packing_list_fabric_item
-        set elements_Id = #{newElmentId}
+        update sy_packing_list_fabric_item a
+        left join sy_packing_list_fabric b
+        on a.sy_packing_list_fabric_id = b.id
+        set a.elements_Id = #{newElmentId}
         <if test='type !="0"'>
-            where elements_Id = #{elmentId} and del_flag = '0'
+            where a.elements_Id = #{elmentId} and a.del_flag = '0' and b.push_State = '0'
         </if>
         <if test='type =="0"'>
 
-            where elements_id = #{elmentId} and del_flag = '0' and order_Number = #{code}
+            where a.elements_id = #{elmentId} and a.del_flag = '0' and a.order_Number = #{code} and b.push_State = '0'
         </if>
 
     </update>
 
     <update id="updateTailoring">
-        update sy_packing_list_tailoring_item
-        set elements_Id = #{newElmentId}
-        where elements_Id = #{elmentId} and del_flag = '0'
+        update sy_packing_list_tailoring_item a
+        left join sy_packing_list_tailoring b
+        on a.sy_packing_list_tailoring_id = b.id
+        set a.elements_Id = #{newElmentId}
+        where a.elements_Id = #{elmentId} and a.del_flag = '0' and b.Push_state = '0'
 
 
     </update>
 
     <update id="updatesyShippingOrderItem">
-        update sy_shipping_order_item
-        set elements_Id = #{newElmentId}
+        update sy_shipping_order_item a
+        left join sy_shipping_order b
+        on a.sy_shipping_order_item_id = b.id
+        set a.elements_Id = #{newElmentId}
         <if test='type !="0"'>
-            where elements_Id = #{elmentId} and del_flag = '0'
+            where a.elements_Id = #{elmentId} and a.del_flag = '0' and b.sy_stuta = '0'
         </if>
         <if test='type =="0"'>
-            where elements_Id = #{elmentId} and del_flag = '0' and order_number = #{code}
+            where a.elements_Id = #{elmentId} and a.del_flag = '0' and a.order_number = #{code} and b.sy_stuta = '0'
         </if>
 
     </update>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -211,7 +211,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getSmallPo())){
 			String[] smllSplit = syShippingDetails.getSmallPo().split(",");
 			List<String> asList = Arrays.asList(smllSplit);
-			queryWrapper.in("t.id",asList);
+			queryWrapper.in("t.smallPo",asList);
 		}
 
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
@@ -1117,7 +1117,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  pushvo.setSuccess(true);
 			  pushvo.setResult(pushShippingDeialVoList.get(0));
 			  pushvo.setMessage("推送成功！");
-
 		  }else{
 			  shippingDetails.setPushState("2");
 			  shippingDetails.setPushMessage(message);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -226,16 +226,18 @@ ${ew.customSqlSegment}
     </update>
 
     <update id="writeBackElenmentId">
-        update sy_shipping_details_item
-        set elements_id = #{elementsId}
+        update sy_shipping_details_item a
+        left join sy_shipping_details b
+        on a.shipping_details_id = b.id
+        set a.elements_id = #{elementsId}
         <if test='type !="0"'>
-            where  id in
+            where b.push_state = '0' and a.id in
             <foreach collection="id" item="item"  open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
         <if test='type =="0"'>
-            where  order_number = #{code}  and id in
+            where b.push_state = '0' and  a.order_number = #{code}  and a.id in
             <foreach collection="id" item="item"  open="(" separator="," close=")">
                 #{item}
             </foreach>