发运明细跟预托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -19,6 +19,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo;
+import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositMapper;
 import org.jeecg.modules.documents.letterDeposit.service.ISyLetterDepositItemService;
 import org.jeecg.modules.documents.letterDeposit.service.ISyLetterDepositService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -59,6 +60,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 	private ISyLetterDepositService syLetterDepositService;
 	@Autowired
 	private ISyLetterDepositItemService syLetterDepositItemService;
+	@Autowired
+	private SyLetterDepositMapper syLetterDepositMapper;
 	
 	/**
 	 * 分页列表查询
@@ -81,7 +84,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		try {
 			QueryWrapper<SyLetterDeposit> queryWrapper = QueryGenerator.initQueryWrapper(syLetterDeposit, req.getParameterMap());
 			Page<SyLetterDeposit> page = new Page<SyLetterDeposit>(pageNo, pageSize);
-			queryWrapper.eq("a.del_flag",0).groupBy("letter_groupid").orderByDesc("a.depositary_receipt_no");
+			queryWrapper.eq("a.del_flag",0).groupBy("a.id").orderByDesc("a.depositary_receipt_no");
 			IPage<SyLetterDeposit> pageList = syLetterDepositService.querySyLetterDeposit(page, queryWrapper);
 			result.setSuccess(true);
 			result.setMessage("查询成功！");
@@ -256,12 +259,13 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				return result;
 			}
 			SyLetterDeposit syLetterDeposit = syLetterDepositService.getById(id);
+			List<SyLetterDepositItem> itemList = syLetterDepositMapper.queryItem(id);
 			//查询子表信息
-			QueryWrapper<SyLetterDepositItem> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("sy_letter_deposit_id",id).eq("del_flag",0).groupBy("letter_groupid");
-			List<SyLetterDepositItem> syLetterDepositItemList = syLetterDepositItemService.list(queryWrapper);
-            if(syLetterDepositItemList.size()!=0){
-				syLetterDeposit.setSyLetterDepositItemList(syLetterDepositItemList);
+//			QueryWrapper<SyLetterDepositItem> queryWrapper = new QueryWrapper<>();
+//			queryWrapper.eq("sy_letter_deposit_id",id).eq("del_flag",0).groupBy("letter_groupid");
+//			List<SyLetterDepositItem> syLetterDepositItemList = syLetterDepositItemService.list(queryWrapper);
+            if(itemList.size()!=0){
+				syLetterDeposit.setSyLetterDepositItemList(itemList);
 			}
 
             result.setSuccess(true);
@@ -326,6 +330,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 }
 		 queryWrapper.eq("a.del_flag",0);
 		 queryWrapper.eq("b.del_flag",0);
+		 queryWrapper.eq("a.is_reference",0);
 		 queryWrapper.groupBy("b.group_id");
 		 queryWrapper.orderByDesc("a.create_time");
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDeposit.java

@@ -128,10 +128,7 @@ public class SyLetterDeposit {
 	@Excel(name = "美元", width = 15)
     @ApiModelProperty(value = "美元")
 	private java.math.BigDecimal usd;
-	/**订单号*/
-	@Excel(name = "订单号", width = 15)
-    @ApiModelProperty(value = "订单号")
-	private java.lang.String orderNumber;
+
 	/**客户简称*/
 	@Excel(name = "客户简称", width = 15)
     @ApiModelProperty(value = "客户简称")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDepositItem.java

@@ -200,4 +200,20 @@ public class SyLetterDepositItem {
 	@ApiModelProperty(value = "预装箱单子表ID集合")
     private String preIds;
 
+	/**订单号*/
+	@Excel(name = "订单号", width = 15)
+	@ApiModelProperty(value = "订单号")
+	private java.lang.String orderNumber;
+
+	/**款号*/
+	@Excel(name = "款号", width = 15)
+	@ApiModelProperty(value = "款号")
+	private java.lang.String itemNumber;
+
+	/**小po*/
+	@Excel(name = "小po", width = 15)
+	@ApiModelProperty(value = "小po")
+	private java.lang.String smallPo;
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/VO/SyPreAssembledPackingListVo.java

@@ -163,4 +163,7 @@ public class SyPreAssembledPackingListVo {
     /**预装箱单分组ID*/
     @ApiModelProperty(value = "预装箱单分组ID")
     private String groupId;
+    /**预装箱单分组ID*/
+    @ApiModelProperty(value = "订单号")
+    private String orderNumber;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/SyLetterDepositMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.letterDeposit.entity.SyRmb;
 import org.jeecg.modules.documents.letterDeposit.entity.SyUsd;
 import org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo;
@@ -41,4 +42,6 @@ public interface SyLetterDepositMapper extends BaseMapper<SyLetterDeposit> {
     //合并预装箱单数据
     IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 
+    //查询子表信息
+    List<SyLetterDepositItem> queryItem(@Param("syId") String syId);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -9,7 +9,7 @@ select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre
 a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
 sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
 sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
-a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,
+a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
 b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
 b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,a.salesman as salesman,a.sales_department
 from sy_pre_assembled_packing_list_item b
@@ -78,15 +78,27 @@ on a.id = b.sy_pre_assembled_packing_list_id
 <!--    </select>-->
 
     <select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
-select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,a.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
+select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
 a.client_abbreviation as clientAbbreviation,
-a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,b.total_gross_weight as totalGrossWeight,b.total_volume as totalVolume,
-a.money as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
+a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
+sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
 a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
 a.the_documents_state as theDocumentsState from sy_letter_deposit a
 left join sy_letter_deposit_item b
 on a.id = b.sy_letter_deposit_id
   ${ew.customSqlSegment}
 
+    </select>
+
+    <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
+
+        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,
+total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
+container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
+hod
+         from sy_letter_deposit_item
+         where del_flag = 0 group by letter_groupid
+
+
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -157,6 +157,9 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setContainerNumber(li.getContainerNumber());
                     itenPojo.setDelFlag("0");
                     itenPojo.setPreIds(perid);
+                    itenPojo.setOrderNumber(li.getOrderNumber());
+                    itenPojo.setItemNumber(li.getItemNumber());
+                    itenPojo.setSmallPo(syper.getSmallPo());
 
                     syLetterDepositItemList.add(itenPojo);
 
@@ -178,6 +181,8 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     preEntity.setContainerCode(li.getContainerCode());
                     //集装箱号
                     preEntity.setContainerNumber(li.getContainerNumber());
+                    //是否被参照
+                    preEntity.setIsReference(1);
                     syPreAssembledPackingListService.updateById(preEntity);
                 }
 

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

@@ -101,6 +101,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	@ApiOperation(value="发运明细主表-分页列表查询", notes="发运明细主表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SyShippingDetailsVo>> queryPageList(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
+								   String refer,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -126,7 +127,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getItemNumber())){
 			queryWrapper.eq("t.itemNumber",syShippingDetails.getItemNumber());
 		}
-
+		if(oConvertUtils.isNotEmpty(refer)){
+			queryWrapper.eq("t.isReference",refer);
+		}
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
 		if(flourOrGarment.equals("0")){//面辅料
 			 IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);
@@ -505,7 +508,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 flourOrGarment,String preDeliveryDate,
+												   String salesman,String customerName,String flourOrGarment,String preDeliveryDateS,String preDeliveryDateE,
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												   HttpServletRequest request, HttpServletResponse response) {
@@ -524,8 +527,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  queryWrapper.eq("a.account", account);
 	  }
 	  if(oConvertUtils.isNotEmpty(startDeliveryDate)){
-		  queryWrapper.ge("a.orderDate", startDeliveryDate);
-		  queryWrapper.le("a.orderDate", endDeliveryDate);
+		  queryWrapper.ge("a.order_date", startDeliveryDate);
+		  queryWrapper.le("a.order_date", endDeliveryDate);
 	  }
 	  if (oConvertUtils.isNotEmpty(salesman)) {
 		  queryWrapper.eq("a.salesman", salesman);
@@ -533,8 +536,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);
+	  if (oConvertUtils.isNotEmpty(preDeliveryDateS)) {
+		  queryWrapper.ge("b.pre_delivery_date", preDeliveryDateS);
+		  queryWrapper.le("b.pre_delivery_date", preDeliveryDateE);
 	  }
 
 	  queryWrapper.eq("a.del_flag", 0);

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

@@ -51,7 +51,7 @@
 
 
 <select id="queryShippingDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
-    select t.* from(select a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
     b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,
     b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
     sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,
@@ -79,7 +79,7 @@ ${ew.customSqlSegment}
 </select>
 
     <select id="queryShippingDetailsGarment" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
-    select t.* from(select a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
     b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,
     b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
     sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,