报关要素调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/seclarationElements/service/impl/SyDeclarationElementsServiceImpl.java

@@ -137,7 +137,7 @@ public class SyDeclarationElementsServiceImpl extends ServiceImpl<SyDeclarationE
                 }
 
                 //查询其他发运明细是否有相同getInventoryCcode().substring(0,2).equals("19")
-                List<SyShippingDetailsVo> list2 = syShippingDetailsMapper.queryAllsyShippingDeial(zero.getItemNumber(),zero.getInventoryName(),zero.getOmpoAccount());
+                List<SyShippingDetailsVo> list2 = syShippingDetailsMapper.queryAllsyShippingDeial(zero.getItemNumber(),zero.getInventoryCode(),zero.getAccount(),zero.getOrderNumber());
                 for(SyShippingDetailsVo li2:list2){
                     shippingList.add(li2.getItemIds());
                 }

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

@@ -56,7 +56,7 @@ public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
     public int batchSubmission(@Param("submitListId") List<String> submitListId,@Param("type") String type);
 
     //查询其他发运明细（维护报关要素，其他所有一样的条件全部更新掉）
-    public List<SyShippingDetailsVo> queryAllsyShippingDeial(@Param("itemNumber") String itemNumber,@Param("inventoryName") String inventoryName,@Param("ompoAccount") String ompoAccount);
+    public List<SyShippingDetailsVo> queryAllsyShippingDeial(@Param("itemNumber") String itemNumber,@Param("inventoryCode") String inventoryCode,@Param("ompoAccount") String ompoAccount,@Param("orderNumber") String orderNumber);
 
     //面辅料导出使用
     public List<SyShippingDetailsVo> excelItem(@Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);

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

@@ -265,7 +265,8 @@ ${ew.customSqlSegment}
         left join sy_shipping_details_item b
         on a.id = b.shipping_details_id
         where a.del_flag = 0 and b.del_flag = 0 and b.item_number = #{itemNumber}
-        and b.inventory_name = #{inventoryName} and b.ompo_account = #{ompoAccount}
+        and b.inventory_code = #{inventoryCode} and b.account = #{ompoAccount}
+        and b.order_number = #{orderNumber}
         and a.push_state != '1'
 
     </select>