成衣增加查询条件

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -139,6 +139,9 @@ public class SyPackingListTailoringController {
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 			queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
 		}
+		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
+			queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
 			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
 		}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1254,7 +1254,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					}else{
 						if(orderData!=null&&orderData.containsKey("id")){
 							orderDataItem=syPackingListTailoringMapper.getOmOrPoItem("PO_PoDetails", "poid='"+orderData.get("id")+"' and ivouchrowno='"+
-									((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
+							((Map<String,String>)mapt.get("itemSort")).get(item.getId())+"'","ID");//根据行号获取信息
 						}
 					}
 					if(orderDataItem!=null){
@@ -1471,7 +1471,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			if (maps.containsKey(account)){
 				switch (maps.get(account).get("index")){
 					case "1":	//代表已完成第一道
-						if(!account.equals("102")){
+						if(!account.equals("102")||mapt.get("customerCode").equals("T020001")){
 							//JSONObject jsonObject1=resturn1.getJSONObject(0);//采购入库单
 							String purchaseinName=maps.get(account).get("code");//获取销售发货单
 							//String purchaseinName=jsonObject1.get("U8ReceiptNo").toString();//获取销售发货单
@@ -1578,7 +1578,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 		}
 
-		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("102")){
+		if(!((Map) mapList.get(0)).get("CACCID").toString().equals("102")||mapt.get("customerCode").equals("T020001")){
 			JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 			recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 			recording(main,recording);