发运明细参照订单，托书增加字段

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

@@ -947,14 +947,14 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  if (oConvertUtils.isNotEmpty(smallPo)) {
 		  queryWrapper.like("b.small_po", smallPo);
 	  }
-	  if(oConvertUtils.isNotEmpty(refer)){
-	  	if(refer.equals("1")){
-			queryWrapper.le("b.surplus_num", 0);
-		}else{
-			queryWrapper.gt("b.surplus_num", 0);
-		}
-
-	  }
+//	  if(oConvertUtils.isNotEmpty(refer)){
+//	  	if(refer.equals("1")){
+//			queryWrapper.eq("b.surplus_num",0);
+//		}else{
+//			queryWrapper.gt("b.surplus_num", 0);
+//		}
+//
+//	  }
 	  queryWrapper.eq("a.del_flag", 0);
 	  queryWrapper.eq("b.del_flag", 0);
 
@@ -962,9 +962,9 @@ 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");
 	  if(flourOrGarment.equals("0")){ //面辅料
-		  pageList = syShippingDetailsMapper.queryOrderDataGarment(page, queryWrapper);
+		  pageList = syShippingDetailsMapper.queryOrderDataGarment(page, queryWrapper,refer);
 	  }else{ //成衣
-		  pageList = syShippingDetailsService.queryOrderData(page, queryWrapper);
+		  pageList = syShippingDetailsService.queryOrderData(page, queryWrapper,refer);
 	  }
 
 	  result.setSuccess(true);

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.documents.shippingDetails.entity.VO;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -275,4 +276,8 @@ public class OrderDataVo {
 
     @Excel(name = "单位", width = 15)
     private String masterMetering;
+
+    //是否被参照
+    @TableField(exist = false)
+    private String refer;
 }

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

@@ -19,10 +19,10 @@ import org.jeecg.modules.documents.shippingDetails.entity.VO.*;
 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,@Param("refer") String refer);
 
     //发运明细查询订单数据 -面辅料的
-    public IPage<OrderDataVo> queryOrderDataGarment(IPage<OrderDataVo> page, @Param("ew") QueryWrapper<OrderDataVo> queryWrapper);
+    public IPage<OrderDataVo> queryOrderDataGarment(IPage<OrderDataVo> page, @Param("ew") QueryWrapper<OrderDataVo> queryWrapper,@Param("refer") String refer);
 
     //发运明细分页列表查询 -成衣的
     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

@@ -24,6 +24,12 @@ a.end_customer) as endCustomer,
         left join sy_order_data a
         on a.id = b.sy_order_data_id
         ${ew.customSqlSegment}
+        <if test="refer == '1'">
+          and (sum(b.surplus_num) - sum(b.quantity)) != 0
+        </if>
+        <if test="refer == '0'">
+            and (sum(b.surplus_num) - sum(b.quantity)) = 0
+        </if>
 
             AND b.inventory_ccode like '19%'
         group by concat(a.order_number,a.customer_abbreviation,a.sales_department,a.salesman,a.account,b.pre_delivery_date,a.order_remarks,
@@ -48,7 +54,14 @@ a.end_customer) as endCustomer,
         left join sy_order_data a
         on a.id = b.sy_order_data_id
         ${ew.customSqlSegment}
-            AND b.inventory_ccode not like '19%'
+        <if test='refer == "1"'>
+            and (b.surplus_num - b.quantity) != 0
+        </if>
+        <if test='refer == "0"'>
+            and (b.surplus_num - b.quantity) = 0
+        </if>
+
+        AND b.inventory_ccode not like '19%'
     </select>
 
 
@@ -243,7 +256,7 @@ ${ew.customSqlSegment}
         b.inventory_code as inventoryCode,b.inventory_name as inventoryName,c.declaration_name as declarationName,a.create_by as createBy,a.create_time as createTime,
         b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight as weight,b.is_reference as isReference,
         b.excess_quantity as excessQuantity,c.declaration_unit as masterMetering,b.garment_factory as garmentFactory,b.shipment_quantity as shipmentQuantity,
-        b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,
+        b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,b.account as account,
         b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode
          from sy_shipping_details a
 left join sy_shipping_details_item b

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

@@ -22,7 +22,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 refer);
 
     //新增发运明细
     public SyShippingDetails syShippingDetailsAdd(SyShippingDetails syShippingDetails) throws ParseException;

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

@@ -61,8 +61,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 refer) {
+        return syShippingDetailsMapper.queryOrderData(page, queryWrapper,refer);
     }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/SyShippingOrder.java

@@ -239,6 +239,10 @@ public class SyShippingOrder {
 	@Excel(name = "同步状态", width = 15)
 	@ApiModelProperty(value = "同步状态")
 	private String syStuta;
+	/**经营单位国内外*/
+	@Excel(name = "经营单位国内外", width = 15)
+	@ApiModelProperty(value = "经营单位国内外")
+	private String isAhaa;
 
 	//成衣工厂
 	@TableField(exist = false)

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -8,7 +8,7 @@
   a.total_gross_weight as totalGrossWeight,case when b.ready_fabric != '成衣' then b.volume else a.total_volume end as totalVolume,b.box_number as planQuantity,b.client_abbreviation as clientAbbreviation,
   a.money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.ready_fabric as readyFabric,
   a.consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,a.the_final_shipping_date as theFinalShippingDate,a.sy_stuta as syStuta,
-  a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,
+  a.addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.isAhaa as isAhaa,
   a.notifier,a.nottfy,a.destination_port as destinationPort,a.latest_date_of_shipment as latestDateOfShipment,a.the_documents_state as theDocumentsState
   from sy_shipping_order a
   left join sy_shipping_order_item b