发运明细

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

@@ -491,7 +491,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
   @GetMapping(value = "/queryOrderData")
   public Result<IPage<OrderDataVo>> queryOrderData(String orderNumber,String account,String startDeliveryDate,String endDeliveryDate,
-												   String salesman,String customerName,
+												   String salesman,String customerName,String flourOrGarment,String preDeliveryDate,
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												   HttpServletRequest request, HttpServletResponse response) {
@@ -508,8 +508,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  queryWrapper.eq("a.account", account);
 	  }
 	  if(oConvertUtils.isNotEmpty(startDeliveryDate)){
-		  queryWrapper.ge("b.pre_delivery_date", startDeliveryDate);
-		  queryWrapper.le("b.pre_delivery_date", endDeliveryDate);
+		  queryWrapper.ge("a.orderDate", startDeliveryDate);
+		  queryWrapper.le("a.orderDate", endDeliveryDate);
 	  }
 	  if (oConvertUtils.isNotEmpty(salesman)) {
 		  queryWrapper.eq("a.salesman", salesman);
@@ -517,6 +517,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if (oConvertUtils.isNotEmpty(customerName)) {
 		  queryWrapper.like("a.customer_name", customerName);
 	  }
+	  if (oConvertUtils.isNotEmpty(preDeliveryDate)) {
+		  queryWrapper.like("b.pre_delivery_date", preDeliveryDate);
+	  }
 
 	  queryWrapper.eq("a.del_flag", 0);
 	  queryWrapper.eq("b.del_flag", 0);
@@ -525,7 +528,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  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);
+	  IPage<OrderDataVo> pageList = syShippingDetailsService.queryOrderData(page, queryWrapper,flourOrGarment);
 	  result.setSuccess(true);
 	  result.setResult(pageList);
 	  result.setMessage("查询成功！");

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

@@ -21,7 +21,7 @@ import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo
 public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
 
     //发运明细查询订单数据
-    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, @Param("ew") QueryWrapper<OrderDataVo> queryWrapper);
+    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, @Param("ew") QueryWrapper<OrderDataVo> queryWrapper,String flourOrGarment);
 
     //发运明细分页列表查询
     public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);

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

@@ -17,6 +17,12 @@
         left join sy_order_data a
         on a.id = b.sy_order_data_id
         ${ew.customSqlSegment}
+        <if test='flourOrGarment =="0"'>
+            AND (b.inventory_code not like '19%' and b.inventory_code not like 'N19%')
+        </if>
+        <if test='flourOrGarment =="1"'>
+            AND (b.inventory_code like '19%' or b.inventory_code like 'N19%')
+        </if>
 
     </select>
 
@@ -36,7 +42,7 @@
     a.english_product_name as englishProductName,b.garment_factory as garmentFactory from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id and b.del_flag = 0
-where a.del_flag = 0 GROUP BY
+where a.del_flag = 0 GROUP BY a.document_no,
 b.order_number,b.customer_abbreviation,b.sales_department,b.salesman,a.account,b.pre_delivery_date,b.order_remarks,
 			  b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules
 

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

@@ -24,7 +24,7 @@ public interface ISyShippingDetailsService extends IService<SyShippingDetails> {
 
 
     //发运明细查询订单数据
-    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, QueryWrapper<OrderDataVo> queryWrapper);
+    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, QueryWrapper<OrderDataVo> queryWrapper,String flourOrGarment);
 
     //新增发运明细
     public SyShippingDetails syShippingDetailsAdd(SyShippingDetails syShippingDetails);

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

@@ -54,8 +54,8 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
      * @return
      */
     @Override
-    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, QueryWrapper<OrderDataVo> queryWrapper) {
-        return syShippingDetailsMapper.queryOrderData(page, queryWrapper);
+    public IPage<OrderDataVo> queryOrderData(IPage<OrderDataVo> page, QueryWrapper<OrderDataVo> queryWrapper,String flourOrGarment) {
+        return syShippingDetailsMapper.queryOrderData(page, queryWrapper,flourOrGarment);
     }
 
 
@@ -171,7 +171,7 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
             for (SyShippingDetailsItem li:list) {
                 SyOrderDataItem orderDataItem = syOrderDataItemService.getById(li.getSyOrderDataItemId());
                 if (oConvertUtils.isNotEmpty(orderDataItem)) {
-                    BigDecimal suerBox = orderDataItem.getSurplusNum().subtract(li.getShipmentQuantity());
+                    BigDecimal suerBox = orderDataItem.getSurplusNum().add(li.getShipmentQuantity());
                     orderDataItem.setSurplusNum(suerBox);
                     syOrderDataItemService.updateById(orderDataItem);
                 }