发票推送修改

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -554,10 +554,10 @@ public class SyPackingListFabricController implements Job {
 		 }
 		 Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(listFabrics.get(0).getId());//获取一些日期信息
 		 for (SyPackingListFabric fabric : listFabrics){
-			 if (!fabric.getPushState().equals("1")&&fabric.getDocumentNo().indexOf("ML")>-1){
+			/* if (!fabric.getPushState().equals("1")&&fabric.getDocumentNo().indexOf("ML")>-1){
 				 System.out.println("需要装箱单全部推送成功，才能推送发票");
 				 return "需要装箱单全部推送成功，才能推送发票";
-			 }
+			 }*/
 			 //System.out.println("madate\t"+mapdate);
 			 if(mapdate!=null){
 				 if(mapdate.containsKey("e1")&&mapdate.get("e1")!=null) {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1179,7 +1179,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
 			map.put("DDATE", date2);//日期(格式2015-01-01)
 			map.put("CMAKER",createBy);//制单人
-			map.put("CMEMO",main.getRemarks());//制单人
+			map.put("CMEMO",main.getRemarks());//备注
 			map.put("CHANDLER",createBy);//审核人
 			map.put("cVouchType",1);//传1
 
@@ -1190,7 +1190,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map2.put("CGLTYPE","委外订单");//出库类别
 			map2.put("CRDCODE","22");//暂时设置成默认 Rd_Style有相关数据
 			map2.put("CMAKER",createBy);//制单人
-			map2.put("CMEMO",main.getRemarks());//制单人
+			map2.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map3=new JSONObject();//销售发货单
 			map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
@@ -1198,7 +1198,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map3.put("BRETURNFLAG","0");//退货标识(1：退货，0：发货)
 			map3.put("CMAKER",createBy);//制单人名称
 			map3.put("CVERIFIER",createBy);//审核人名称
-			map3.put("CMEMO",main.getRemarks());//制单人
+			map3.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map4=new JSONObject();//销售出库单
 			map4.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("ccode","rdrecord32","dnmaketime")));//单据号
@@ -1206,7 +1206,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
 			map4.put("CMAKER",createBy);//制单人
-			map4.put("CMEMO",main.getRemarks());//制单人
+			map4.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map5=new JSONObject();//采购发票
 			map5.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cpbvcode ","PurBillVouch","cmaketime")));//发票号
@@ -1215,7 +1215,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map5.put("CMAKER",createBy);//制单人
 			map5.put("CGLTYPE","入库单");
 			map5.put("CHANDLER",createBy);//审核人
-			map5.put("CMEMO",main.getRemarks());//制单人
+			map5.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map6=new JSONObject();//销售发票
 			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","cSBVCode")));//发票号
@@ -1223,7 +1223,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
 			map6.put("CVERIFIER",createBy);//制单人名称
-			map6.put("CMEMO",main.getRemarks());//制单人
+			map6.put("CMEMO",main.getRemarks());//备注
 
 			JSONObject map7=new JSONObject();//采购(委外)入库单
 			map7.put("CVOUCHCODE", org.jeecg.modules.system.util.oConvertUtils.addOne(org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cCode","RdRecord01","dnmaketime"))));//获取单据号
@@ -1234,7 +1234,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map7.put("CGLTYPE","委外订单");//来源单据类型
 			//map7.put("CMAKER",createBy);//制单人
 			map7.put("CHANDLER",createBy);//审核人
-			map7.put("CMEMO",main.getRemarks());//制单人
+			map7.put("CMEMO",main.getRemarks());//备注
 
 
 			map.put("CDEFINE4",main.getTheFinalShippingDate());//最终船期
@@ -2181,6 +2181,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							"f.AutoID  as isosid,\n" +
 							"b.iQuantity  as inventoryQuantity,\n" +
 							"b.cbMemo as remarks2,\n" +
+							"b.cbMemo as remarks,\n" +
 							"b.cbMemo as memo,\n" +
 							"f.iTaxUnitPrice as price,\n" +
 							"d.cPersonName as salesman,\n" +
@@ -2442,6 +2443,16 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			SyPackingListFabric syPackingListFabric=listFabricMaps.get(customer).get(0);
 			//List<SyPackingListFabricItem> listFabricItems=syPackingListFabric.getSyPackingListFabricItem();//需要进行分组
 			List<SyPackingListFabricItem> listFabricItems=listFabricItemMaps.get(customer);
+
+			String istc=syPackingListFabric.getSyPackingListFabricItem().get(0).getIsTc();
+			//String remarks="";
+			if (istc!=null&&istc.equals("1")){
+				if(syPackingListFabric.getRemarks()!=null){
+					syPackingListFabric.setRemarks(syPackingListFabric.getRemarks()+"TC证书");
+				}else{
+					syPackingListFabric.setRemarks("TC证书");
+				}
+			}
 			//System.out.println("codes.size\t"+codes.size());
 			System.out.println("codes\t"+codes);
 			List<Map<String,Object>> invoices=getInvoices(customers.get(customer));
@@ -2456,6 +2467,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("CVERIFIER","进出口平台管理员");//审核人
 			jsonObject1.put("CACCID","103");//账套号
 			jsonObject1.put("CTYPE","专用");//发票类型
+			jsonObject1.put("CMEMO",syPackingListFabric.getRemarks());//备注
 			System.out.println("成衣销售order\t"+order);
 			if(order.get("cCusCode").equals("T020001")){
 				jsonObject1.put("CTYPE","普通");//发票类型
@@ -2516,7 +2528,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					//System.out.println("tid\t"+item.getId());
 					//System.out.println("tpid\t"+item.getSyPackingListFabricId());
 				}
-				jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
+				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
+					jsonObject.put("CDEFINE23","千克");//报关单位
+				}else if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("M")){
+					jsonObject.put("CDEFINE23","米");//报关单位
+				}else{
+					jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位
+				}
+				//jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
 				jsonObject.put("CDEFINE31",item.getDeclarationName());//存货名称
 				String iTaxRate=syPackingListFabricItemMapper.getItaxRate(item.getOmpoIdItem());
 				if(iTaxRate!=null){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -304,6 +304,7 @@
 		ompo_Id,
 		spur_Or_Sub_Order,
 		supplier,
+		master_Metering,
 		small_Po,
 		inventory_Code,
 		(select declaration_Name from sy_declaration_elements

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

@@ -1990,6 +1990,15 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			JSONObject  jsonObject1=new JSONObject();
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
 			codeMaps.put(code,listTailoringMaps.get(customer));
+			String istc=syPackingListTailoring.getIsTc();
+			if (istc!=null&&istc.equals("1")){
+				if(syPackingListTailoring.getMemo()!=null){
+					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
+				}else{
+					syPackingListTailoring.setMemo("TC证书");
+				}
+			}
+			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人
 			jsonObject1.put("CHANDLER","进出口平台管理员");//审核人
@@ -2039,7 +2048,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						break;
 					}
 				}
-				jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
+				jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				jsonObject.put("CDEFINE33",item.getDeclarationName());//存货名称
 				jsonArrays.add(jsonObject);
 			}
@@ -2110,6 +2119,16 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			List<Map<String,Object>> invoices=getInvoices(customers.get(customer));
 			JSONObject  jsonObject1=new JSONObject();
 
+			String istc=syPackingListTailoring.getIsTc();
+			if (istc!=null&&istc.equals("1")){
+				if(syPackingListTailoring.getMemo()!=null){
+					syPackingListTailoring.setMemo(syPackingListTailoring.getMemo()+"TC证书");
+				}else{
+					syPackingListTailoring.setMemo("TC证书");
+				}
+			}
+			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
+
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
 			codeMaps.put(code,listTailoringMaps.get(customer));
 			jsonObject1.put("CVOUCHCODE",code);//发票号
@@ -2171,7 +2190,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						break;
 					}
 				}
-				jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
+				//jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位
+				jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位
 				jsonObject.put("CDEFINE31",item.getDeclarationName());//存货名称
 				String iTaxRate=syPackingListFabricItemMapper.getItaxRate(item.getOmpoIdItem());
 				if(iTaxRate!=null){