推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/SyPreAssembledPackingListMapper.java

@@ -26,6 +26,8 @@ public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembl
 
    Integer deleteId(String id);
 
+   void updateIsReference(String id);
+
    IPage<SyPreAssembledPackingListVo> selectPage(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 
    IPage<SyPreAssembledPackingListVo> selectPage4(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -43,6 +43,12 @@
     AND sy_shipping_details.id=#{value} ) t
 	</select>
 
+    <update id="updateIsReference" parameterType="java.lang.String">
+         update sy_shipping_details_item set is_reference='0' where id in
+         (select sy_declaration_elements_item_id from sy_pre_assembled_packing_list_item
+         where sy_pre_assembled_packing_list_id=#{value})
+    </update>
+
     <select id="selectPage" resultType="org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo">
     /*获取汇总数据*/
     SELECT

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -463,6 +463,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			throw new JeecgBootException("该预装箱单单已被预托书号"+deposit.getDepositaryReceiptNo()+"参照");
 		}
 		long startTime = System.currentTimeMillis();
+		syPreAssembledPackingListMapper.updateIsReference(id);
 		//List<SyPreAssembledPackingListItem> items2=syPreAssembledPackingListItemMapper.selectAll(id);
 		syPreAssembledPackingListMapper.deleteId(id);
 		syPreAssembledPackingListItemMapper.deleteByMainId(id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -301,6 +301,7 @@
 		ompo_Id,
 		spur_Or_Sub_Order,
 		supplier,
+		customs_Declaration_Unit_Price,
 		master_Metering,
 		(select smail_po from sy_shipping_order_item
 		where tailoring_Fabric_Item_Id=sy_packing_list_tailoring_item.id and del_flag=0 limit 1) small_Po,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1481,6 +1481,15 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					mapSort.put(item.getId(),ivouchrowno);
 				}
 
+				//测试新区域
+				if(item.getAcSetNo().equals("102")&&mapt.get("account").equals("102")){//如果销售订单账套号等于102,当前推送到了102
+					//102销售发货单、102销售出库单
+					mapItem3.put("ITAXUNITPRICE",item.getCustomsDeclarationUnitPrice());
+				}else if(item.getAcSetNo().equals("102")&&mapt.get("account").equals("102")){//如果销售订单账套号等于102,当前推送到了101
+					//101采购入库单
+					mapItem.put("IORITAXCOST",item.getCustomsDeclarationUnitPrice());//修改成报关单价
+				}
+
 				mapItem.put("CINVCODE",item.getInventoryCode());//存货编码
 				mapItem.put("IQUANTITY",item.getTotal());//数量
 				//mapItem.put("INUM",orderDataItem.get("inum"));//明细ID（采购订单行ID/委外订单行ID）
@@ -2116,6 +2125,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						}else{
 							jsonObject.put("IORITAXCOST",syPackingListTailoringItemMapper.getiTaxPrice(map.get("AutoID").toString()));
 						}
+						if(item.getAcSetNo().equals("102")&&account.equals("101")){
+							jsonObject.put("IORITAXCOST",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
+						}
 						getcFree(jsonObject,map);
 						break;
 					}
@@ -2314,6 +2326,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						autoIds.add(map.get("AutoID"));
 						jsonObject.put("AUTOID_DIS",map.get("AutoID"));
 						getcFree(jsonObject,map);
+						if(item.getAcSetNo().equals("102")&&account.equals("102")){
+							jsonObject.put("ITAXUNITPRICE",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
+						}
 						break;
 					}
 				}