发运明细调整

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

@@ -525,8 +525,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  queryWrapper.eq("b.del_flag", 0);
 	  queryWrapper.gt("b.surplus_num", 0);
 //	  queryWrapper.gt("a.order_date","2021-12-30");
-	  queryWrapper.groupBy("a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks," +
-			  "b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules");
+//	  queryWrapper.groupBy("a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks," +
+//			  "b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules");
 
 	  IPage<OrderDataVo> pageList = syShippingDetailsService.queryOrderData(page, queryWrapper,flourOrGarment);
 	  result.setSuccess(true);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/OrderDataVo.java

@@ -199,9 +199,13 @@ public class OrderDataVo {
     private String garmentFactory;
 
     @Excel(name = "预发货日期", width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private String preDeliveryDate;
 
     @Excel(name = "预完工日期", width = 15,format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private String preCompletionDate;
 
     @Excel(name = "箱数", width = 15)

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

@@ -23,6 +23,8 @@
         <if test='flourOrGarment =="1"'>
             AND (b.inventory_code like '19%' or b.inventory_code like 'N19%')
         </if>
+        group by a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
+        b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules
 
     </select>
 
@@ -115,7 +117,6 @@ ${ew.customSqlSegment}
         on a.id = b.sy_order_data_id and b.del_flag = 0
         ${ew.customSqlSegment}
 
-
     </select>
 
 

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

@@ -131,25 +131,59 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
         if(syShippingDetailsEntity.getState().equals("1")){
             throw new JeecgBootException("提交单据不能修改！");
         }
-
-        //回写销售订单剩余数量
+        //获取子表信息
         List<SyShippingDetailsItem> list = entity.getSyShippingDetailsItemList();
-        for (SyShippingDetailsItem li:list) {
+//        //查询原数据子表信息
+//        QueryWrapper<SyShippingDetailsItem> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("shipping_details_id",id).eq("del_flag",0);
+//        List<SyShippingDetailsItem> itemList = syShippingDetailsItemService.list(queryWrapper);
+//        if(itemList.size()!=0){
+//            //把修改的数据赋值给原来的数据
+//            for (SyShippingDetailsItem item :itemList){
+//                for(SyShippingDetailsItem li :list){
+//                    if(item.getId().equals(li.getId())){
+//
+//                    }
+//                }
+//
+//            }
+//            //重新给子表集合赋值
+//            entity.setSyShippingDetailsItemList(itemList);
+//        }
+//        //回写销售订单剩余数量
+//        for (SyShippingDetailsItem li:list) {
+//            SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
+//            if (oConvertUtils.isNotEmpty(orderDataItem)) {
+//                BigDecimal suerBox = orderDataItem.getSurplusNum().subtract(li.getShipmentQuantity());
+//                orderDataItem.setSurplusNum(suerBox);
+//                syOrderDataItemService.updateById(orderDataItem);
+//            }
+//        }
+//        //删除子表
+//        syShippingDetailsMapper.syshippingDetailsItemUpdate(id);
+//        //删除主表
+//        syShippingDetailsEntity.setDelFlag("1");
+//        updateById(syShippingDetailsEntity);
+//        //新增
+//        syShippingDetailsAdd(entity);
+
+        for(SyShippingDetailsItem li :list){
+            //查询订单子表信息
             SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
+
             if (oConvertUtils.isNotEmpty(orderDataItem)) {
-                BigDecimal suerBox = orderDataItem.getSurplusNum().subtract(li.getShipmentQuantity());
+                //订单箱数减去发货数量
+                BigDecimal suerBox = orderDataItem.getQuantity().subtract(li.getShipmentQuantity());
                 orderDataItem.setSurplusNum(suerBox);
                 syOrderDataItemService.updateById(orderDataItem);
+                //设置发运明细子表订单剩余数量
+                li.setOrderRemainingQuantity(suerBox);
+                //设置发运明细子表剩余数量
+                li.setSurplusQuantity(li.getShipmentQuantity());
             }
+            //修改
+            syShippingDetailsItemService.updateById(li);
         }
-        //删除子表
-        syShippingDetailsMapper.syshippingDetailsItemUpdate(id);
-        //删除主表
-        syShippingDetailsEntity.setDelFlag("1");
-        updateById(syShippingDetailsEntity);
-        //新增
-        syShippingDetailsAdd(entity);
-
         return entity;
     }