托书调整

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

@@ -481,7 +481,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 queryWrapper.eq("a.is_reference",0);
 		 queryWrapper.eq("a.status",1);
 		 queryWrapper.groupBy("a.document_No");
-		 queryWrapper.orderByDesc("a.create_time");
+		 queryWrapper.orderByDesc("a.item_number,b.po_no");
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
 		 IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.querySyPreAssembledPackingList(page, queryWrapper);
 

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

@@ -178,6 +178,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		}
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getId())){
+			queryWrapper.like("t.id",syShippingDetails.getId());
+		}
 
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 		if(flourOrGarment.equals("0")){//面辅料
@@ -822,7 +825,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
   @GetMapping(value = "/queryOrderData")
   public Result<IPage<OrderDataVo>> queryOrderData(String itemNumber,String account,String startDeliveryDate,String endDeliveryDate,String smallPo,String refer,
-												   String salesman,String customerName,String flourOrGarment,String preDeliveryDateS,String preDeliveryDateE,
+												   String salesman,String customerName,String flourOrGarment,String preDeliveryDateS,String preDeliveryDateE,String orderNumber,
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 												   HttpServletRequest request, HttpServletResponse response) {
@@ -834,6 +837,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  QueryWrapper<OrderDataVo> queryWrapper = new QueryWrapper<>();
 
 	  Page<OrderDataVo> page = new Page<OrderDataVo>(1, -1);
+	  if (oConvertUtils.isNotEmpty(orderNumber)) {
+		  queryWrapper.like("a.order_number", orderNumber);
+	  }
 	  if (oConvertUtils.isNotEmpty(itemNumber)) {
 		  queryWrapper.like("b.item_number", itemNumber);
 	  }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1306,4 +1306,29 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 		 return result;
 	 }
 
+
+	 /**
+	  * 查询U8 服务供应商
+	  * @param pkorg
+	  * @return
+	  */
+	 @GetMapping(value = "/queryU8vendor")
+	 public Result<List<SyShippingOrder>> queryU8vendor(String pkorg){
+
+		 Result<List<SyShippingOrder>> result = new Result<List<SyShippingOrder>>();
+		 List<SyShippingOrder> list = null;
+		 
+		 if(pkorg.equals("903")){
+			list = syShippingOrderService.queryU8ventoryThree();
+		 }else if(pkorg.equals("902")){
+			 list = syShippingOrderService.queryU8ventoryTwo();
+		 }else if(pkorg.equals("901")){
+			 list = syShippingOrderService.queryU8ventoryOne();
+		 }
+
+		 result.setResult(list);
+		 result.setSuccess(true);
+		 return result;
+	 }
+
 }

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

@@ -258,6 +258,11 @@ public class SyShippingOrder {
 	//区分成衣或者面料
 	private String readyFabric;
 
+	//货代编码
+	private String cvencode;
+	//货代名称
+	private String cvenname;
+
 	//总数量
 	@TableField(exist = false)
 	private BigDecimal tatolNumber;

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

@@ -121,6 +121,8 @@ public class SyPackingList {
     private String exchangeEarningsValue;
     //成交方式
     private String termsOfDeliveryvalue;
+    //账套号
+    private String acSetNo;
 
 
     /**

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

@@ -66,4 +66,7 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
     //查询子表信息
     public List<SyShippingOrderItem> qeuryItemInfo(@Param("id") String id);
 
+    //查询U8 服务供应商
+    public List<SyShippingOrder> queryU8ventory();
+
 }

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

@@ -20,7 +20,7 @@
 <!--    查询装箱单-成衣-->
   <select id="queryTailoring" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 select a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.order_Number as orderNumber,
-a.item_number as itemNumber,a.customer_abbreviation as customerAbbreviation,b.hod as preDeliveryDate,
+a.item_number as itemNumber,a.customer_abbreviation as customerAbbreviation,b.hod as preDeliveryDate,ac_set_no as acSetNo,
 b.small_po as smallPo,b.distribution_point as distributionPoint,b.spur_Or_Sub_Order as purOrSubOrder,
 a.total as number,a.total_Boxes as planQuantity,round(a.total_Gross_Weight,2) as grossWeight,round(a.total_Net_Weight,2) as netWeight,
 a.total_Volume as totalVolume,a.container_code as containerCode,a.container_number as containerNumber,
@@ -48,7 +48,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 
   select c.hs_code as hsCode,c.declaration_name as declarationName,a.id as id ,GROUP_CONCAT(b.id) as itemId,a.document_No as documentNo,a.create_by as createBy,
   a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
-  b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,
+  b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,account as acSetNo,
   case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,concat(sum(b.actual_declared_quantity),'.00') as number,
    sum(b.rolls) as planQuantity,
   b.item_Number as itemNumber,b.small_Po as smallPo,round(sum(b.gross_weight),2) as grossWeight,
@@ -209,4 +209,10 @@ group by order_number
     </select>
 
 
+
+    <select id="queryU8ventory" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
+
+	   select cVenCode as cvencode,cvenName as cvenname from Vendor where bVenService = '1'
+    </select>
+
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/ISyShippingOrderService.java

@@ -46,5 +46,8 @@ public interface ISyShippingOrderService extends IService<SyShippingOrder> {
     public Integer saveSalePayVouchThree(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList);
 
 
-
+    //查询U8 服务供应商
+    public List<SyShippingOrder> queryU8ventoryOne();
+    public List<SyShippingOrder> queryU8ventoryTwo();
+    public List<SyShippingOrder> queryU8ventoryThree();
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -207,12 +207,14 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setClientAbbreviation(li.getClientAbbreviation());//客户简称
                         syShippingOrderItem.setTotalPrice(itemli.getTotalPrice());//金额
                         syShippingOrderItem.setSupplier(itemli.getSupplier());
+
                         syShippingOrderItem.setSupplierCode(itemli.getSupplierCode());
                         syShippingOrderItem.setRSupplier(itemli.getSupplierDyeingPlant());//染厂供应商
                         syShippingOrderItem.setRSupplierCode(itemli.getSupplierCodeDyeingPlant());//染厂供应商编码
                         syShippingOrderItem.setMasterMetering(itemli.getMasterMetering());//单位
                         syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());
                         syShippingOrderItem.setEnglishName(li.getEnglishProductName());//英文名称
+                        syShippingOrderItem.setPkOrg(itemli.getAccount());
 
                          itemList.add(syShippingOrderItem);
                     }
@@ -280,6 +282,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());//成衣工厂
                         syShippingOrderItem.setEnglishName(li.getEnglishProductName());//英文名称
                         syShippingOrderItem.setDeclarationUnitPrice(lit.getCustomsDeclarationUnitPrice());//报关单价
+                        syShippingOrderItem.setPkOrg(lit.getAcSetNo());
 
                         itemList.add(syShippingOrderItem);
 
@@ -488,6 +491,11 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
     }
 
+    /**
+     * 新增费用支出单
+     * @param syShippingOrder
+     * @return
+     */
     @Override
     public Integer saveSalePayVouchOne(SyShippingOrder syShippingOrder) {
         return 1;
@@ -507,6 +515,31 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
     }
 
 
+    /**
+     * 查询U8 服务供应商
+     * @return
+     */
+    @DS("multi-one")
+    @Override
+    public List<SyShippingOrder> queryU8ventoryOne() {
+        List<SyShippingOrder> list = syShippingOrderMapper.queryU8ventory();
+        return list;
+    }
+    @DS("multi-two")
+    @Override
+    public List<SyShippingOrder> queryU8ventoryTwo() {
+        List<SyShippingOrder> list = syShippingOrderMapper.queryU8ventory();
+        return list;
+    }
+
+    @DS("multi-three")
+    @Override
+    public List<SyShippingOrder> queryU8ventoryThree() {
+        List<SyShippingOrder> list = syShippingOrderMapper.queryU8ventory();
+        return list;
+    }
+
+
     /**
      * 新增
      * @param map1