u8不推送备注

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/entity/vo/SupplierCapacity5.java

@@ -1,10 +1,10 @@
 package org.jeecg.modules.scas.entity.vo;
 
+
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 
 @Data
 public class SupplierCapacity5 {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/SupplierCapacityMapper.java

@@ -41,7 +41,7 @@ public interface SupplierCapacityMapper extends BaseMapper<SupplierCapacity> {
 
     List<SupplierCapacityVo4> excel004(@Param("ew")QueryWrapper<SupplierCapacityDto> queryWrapper);
 
-    List<SupplierCapacity5> statement1(@Param("year")String year,@Param("month")String month);
+    List<SupplierCapacity5> statement1(@Param("year")String year, @Param("month")String month);
 
     List<SupplierCapacity5> statement2(@Param("year")String year,@Param("month")String month);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/ISupplierCapacityService.java

@@ -17,11 +17,11 @@ public interface ISupplierCapacityService extends IService<SupplierCapacity> {
 
     List<SupplierCapacity> selectList(SupplierCapacityDto supplierCapacityDto);
 
-    List<SupplierCapacityVo1> excel1( QueryWrapper<SupplierCapacityDto> queryWrapper);
+    List<SupplierCapacityVo1> excel1(QueryWrapper<SupplierCapacityDto> queryWrapper);
 
-    List<SupplierCapacityVo2> excel2( QueryWrapper<SupplierCapacityDto> queryWrapper);
+    List<SupplierCapacityVo2> excel2(QueryWrapper<SupplierCapacityDto> queryWrapper);
 
-    List<SupplierCapacityVo3> excel3( QueryWrapper<SupplierCapacityDto> queryWrapper);
+    List<SupplierCapacityVo3> excel3(QueryWrapper<SupplierCapacityDto> queryWrapper);
 
     public IPage<SupplierCapacity> selectPage(IPage<SupplierCapacity> page, QueryWrapper<SupplierCapacityDto> queryWrapper);
 

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

@@ -1190,7 +1190,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
 
@@ -1203,7 +1203,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 map3=new JSONObject();//销售发货单
 			//map3.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cDLCode","DispatchList","dcreatesystime")));//发货单号
@@ -1212,7 +1212,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")));//单据号
@@ -1221,7 +1221,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 map6=new JSONObject();//销售发票
@@ -1231,7 +1231,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 map2=new JSONObject();//材料出库单
@@ -1242,7 +1242,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 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"))));//获取单据号
@@ -1254,7 +1254,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());//最终船期
@@ -1789,7 +1789,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								List<Map<String,Object>> mapItems4= (List<Map<String,Object>>) jsonObject.get("DETAILList");
 								List<Object> ids=new ArrayList<>();
 								for (Map itemMap4 :  mapItems4){
-									/*itemMap4.get("size").equals(map.get("cFree2"))&& */
 									if((Double.parseDouble( itemMap4.get("IQUANTITY").toString())==Double.parseDouble( map.get("iQuantity").toString()))
 									&& !itemMap4.containsKey("AUTOID_SO")&&!ids.contains(map.get("iDLsID"))){
 										ids.add(map.get("iDLsID"));
@@ -2503,7 +2502,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("CVERIFIER","进出口平台管理员");//审核人
 			jsonObject1.put("CACCID","103");//账套号
 			jsonObject1.put("CTYPE","专用");//发票类型
-			jsonObject1.put("CMEMO",syPackingListFabric.getRemarks());//备注
+			//jsonObject1.put("CMEMO",syPackingListFabric.getRemarks());//备注
 			System.out.println("成衣销售order\t"+order);
 			if(order.get("cCusCode").equals("T020001")){
 				jsonObject1.put("CTYPE","普通");//发票类型

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

@@ -1147,7 +1147,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map.put("CVOUCHCODE", pushsno001);//获取单据号
 			//map.put("CVOUCHCODE", main.getId());//获取单据号
 			map.put("DDATE",date2);//日期(格式2015-01-01)
-			map.put("CMEMO",main.getMemo());//备注
+			//map.put("CMEMO",main.getMemo());//备注
 			map.put("CMAKER",createBy);//制单人
 			map.put("CHANDLER",createBy);//审核人
 			map.put("cVouchType",1);//传1
@@ -1158,7 +1158,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map3.put("BRETURNFLAG","0");//退货标识(1：退货，0：发货)
 			map3.put("CMAKER",createBy);//制单人名称
 			map3.put("CVERIFIER",createBy);//审核人名称
-			map3.put("CMEMO",main.getMemo());//备注
+			//map3.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map4=new JSONObject();//销售出库单
 			map4.put("CVOUCHCODE",pushsno004);//单据号
@@ -1166,7 +1166,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map4.put("CHANDLER",createBy);//审核人
 			map4.put("CRDCODE","26");//出库类别
 			map4.put("CMAKER",createBy);//制单人
-			map4.put("CMEMO",main.getMemo());//备注
+			//map4.put("CMEMO",main.getMemo());//备注
 
 			JSONObject map5=new JSONObject();//采购发票
 			map5.put("CVOUCHCODE",pushsno002);//发票号
@@ -1174,7 +1174,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map5.put("CTYPE","专用");//发票类型（01：专用 02：普票）
 			map5.put("CMAKER",createBy);//制单人
 			map5.put("CHANDLER",createBy);//审核人
-			map5.put("CMEMO",main.getMemo());//备注
+			//map5.put("CMEMO",main.getMemo());//备注
 
 
 			JSONObject map6=new JSONObject();//销售发票
@@ -1183,7 +1183,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
 			map6.put("CVERIFIER",createBy);//制单人名称
-			map6.put("CMEMO",main.getMemo());//备注
+			//map6.put("CMEMO",main.getMemo());//备注
 
 			map.put("CDEFINE4",main.getTheFinalShippingDate().substring(0,10));//最终船期
 			map.put("CDEFINE6",main.getTheFinalShippingDate2().substring(0,10));//合同日期
@@ -2012,7 +2012,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //					syPackingListTailoring.setMemo("TC证书");
 //				}
 //			}
-			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
+			//jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 			jsonObject1.put("CVOUCHCODE",code);//发票号
 			jsonObject1.put("CMAKER","进出口平台管理员");//制单人
 			jsonObject1.put("CHANDLER","进出口平台管理员");//审核人
@@ -2158,7 +2158,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 //					syPackingListTailoring.setMemo("TC证书");
 //				}
 //			}
-			jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
+			//jsonObject1.put("CMEMO",syPackingListTailoring.getMemo());//备注
 
 			code=org.jeecg.modules.system.util.oConvertUtils.addOne(code);
 			redisUtil.set("pushsno005", code);//采购委外入库单