发运明细调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/seclarationElements/entity/SyDeclarationElements.java

@@ -95,6 +95,9 @@ public class SyDeclarationElements {
     @ApiModelProperty(value = "备注")
 	private java.lang.Object memo;
 
+	//销售订单号
+	private String orderNumber;
+
 	/**子表集合*/
 	@TableField(exist = false)
 	List<SyDeclarationElementsItem> syDeclarationElementsItemList;
@@ -111,4 +114,5 @@ public class SyDeclarationElements {
 	//销售订单号
 	@TableField(exist = false)
 	String code;
+
 }

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

@@ -4,7 +4,8 @@
 
     <select id="queryList" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
 
-        select a.push_state as pushState,b.id as itemIds,inventory_ccode as inventoryCcode from sy_shipping_details a
+        select a.push_state as pushState,b.id as itemIds,b.inventory_ccode as inventoryCcode,b.inventory_code as inventoryCode,
+         b.item_number as itemNumber,b.inventory_name as inventoryName,b.order_number as orderNumber,b.account from sy_shipping_details a
         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.elements_id = #{elmentId}
@@ -23,13 +24,8 @@
         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 a.elements_Id = #{elmentId} and a.del_flag = '0' and b.push_State = '0'
-        </if>
-        <if test='type =="0"'>
+        where a.elements_Id = #{elmentId} and a.del_flag = '0' and b.push_State = '0'
 
-            where a.elements_id = #{elmentId} and a.del_flag = '0' and a.order_Number = #{code} and b.push_State = '0'
-        </if>
 
     </update>
 
@@ -48,12 +44,8 @@
         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 a.elements_Id = #{elmentId} and a.del_flag = '0' and b.sy_stuta = '0'
-        </if>
-        <if test='type =="0"'>
-            where a.elements_Id = #{elmentId} and a.del_flag = '0' and a.order_number = #{code} and b.sy_stuta = '0'
-        </if>
+        where a.elements_Id = #{elmentId} and a.del_flag = '0' and b.sy_stuta = '0'
+
 
     </update>
 </mapper>

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

@@ -123,6 +123,7 @@ public class SyDeclarationElementsServiceImpl extends ServiceImpl<SyDeclarationE
             syDeclarationElements.setAcSetNo(zero.getOmpoAccount());
             syDeclarationElements.setItemNumber(zero.getItemNumber());
             syDeclarationElements.setInventoryName(zero.getInventoryName());
+            syDeclarationElements.setOrderNumber(zero.getOrderNumber());//销售订单号
 
             //新增子表
                 List<SyDeclarationElementsItem> list = syDeclarationElements.getSyDeclarationElementsItemList();
@@ -176,6 +177,13 @@ public class SyDeclarationElementsServiceImpl extends ServiceImpl<SyDeclarationE
                 }
                 //新增主表
                 syDeclarationElements.setId(uuid);
+                //获取第一条数据
+                SyShippingDetailsVo zero = list1.get(0);
+                syDeclarationElements.setInventoryCode(zero.getInventoryCode());
+                syDeclarationElements.setAcSetNo(zero.getAccount());
+                syDeclarationElements.setItemNumber(zero.getItemNumber());
+                syDeclarationElements.setInventoryName(zero.getInventoryName());
+                syDeclarationElements.setOrderNumber(zero.getOrderNumber());//销售订单号
                 save(syDeclarationElements);
 
                     //修改发运明细报关要素ID

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

@@ -1164,6 +1164,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 syDeclarationElementsEntityNull.setAcSetNo(zero.getAccount());
 			 syDeclarationElementsEntityNull.setItemNumber(zero.getItemNumber());
 			 syDeclarationElementsEntityNull.setInventoryName(zero.getInventoryName());
+			 syDeclarationElementsEntityNull.setOrderNumber(zero.getOrderNumber());
 
 			 List<SyDeclarationElementsItem> entityList = new ArrayList<>();
 			 syDeclarationElementsEntityNull.setSyDeclarationElementsItemList(entityList);
@@ -1512,7 +1513,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  * @return
 	  */
 	 @GetMapping(value = "/queryLatelyDeclarationElements")
-	 public Result<SyDeclarationElements> queryLatelyDeclarationElements(String hscode,String itemNumber,
+	 public Result<SyDeclarationElements> queryLatelyDeclarationElements(String hscode,String itemNumber,String orderNumber,String pkOrg,
 																   HttpServletRequest request, HttpServletResponse response) {
 
 		 Result<SyDeclarationElements> result = new Result<SyDeclarationElements>();
@@ -1523,7 +1524,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 return result;
 		 }
 	 	QueryWrapper<SyDeclarationElements> queryWrapper = new QueryWrapper<>();
-		 queryWrapper.eq("declaration_name",hscode).eq("del_flag",0).orderByDesc("create_time");
+		 queryWrapper.eq("declaration_name",hscode).eq("del_flag",0)
+//				 .eq("order_number",orderNumber).eq("ac_set_no",pkOrg).eq("item_number",itemNumber)
+				 .orderByDesc("create_time");
 		 List<SyDeclarationElements> list = syDeclarationElementsService.list(queryWrapper);
 		 if(list.size()!=0){
 			 SyDeclarationElements entity = list.get(0);

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

@@ -228,18 +228,11 @@ ${ew.customSqlSegment}
     <update id="writeBackElenmentId">
         update sy_shipping_details_item
         set elements_id = #{elementsId}
-        <if test='type !="0"'>
             where id in
             <foreach collection="id" item="item"  open="(" separator="," close=")">
                 #{item}
             </foreach>
-        </if>
-        <if test='type =="0"'>
-            where order_number = #{code}  and id in
-            <foreach collection="id" item="item"  open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
+
 
     </update>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -123,9 +123,9 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 }
 
                 //设置物料成分 和 是否TC
-                //根据款号物料名称查询相同数据并赋值
+                //根据款号物料名称查询相同数据并赋值,(2023.03.14现改为：订单号+款号+账套)
                 QueryWrapper<SyShippingDetailsItem> queryWrapper1 = new QueryWrapper<>();
-                queryWrapper1.eq("item_number",li.getItemNumber()).eq("inventory_code",li.getInventoryCode()).eq("del_flag",0);
+                queryWrapper1.eq("item_number",li.getItemNumber()).eq("order_number",li.getOrderNumber()).eq("del_flag",0);
                 queryWrapper1.orderByDesc("create_time");
                 List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(queryWrapper1);
                 if(list.size()!=0){
@@ -152,9 +152,9 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
                 entity.setCustomsDeclarationUnitPrice(customsDeclarationUnitPrice);
 
                 //获取报关要素ID
-                //根据条件查询报关要素信息
+                //根据条件查询报关要素信息(2023.03.14现改为：订单号+款号+账套)
                 QueryWrapper<SyDeclarationElements> elementsQueryWrapper = new QueryWrapper<>();
-                elementsQueryWrapper.eq("inventory_name",li.getInventoryName()).eq("ac_set_no",li.getOmpoAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0);
+                elementsQueryWrapper.eq("order_number",li.getOrderNumber()).eq("ac_set_no",li.getOmpoAccount()).eq("item_number",li.getItemNumber()).eq("del_flag",0);
                 elementsQueryWrapper.orderByDesc("create_time");
                 List<SyDeclarationElements> elementsList = syDeclarationElementsService.list(elementsQueryWrapper);
                 if(elementsList.size() != 0){