装箱单辅料

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -167,6 +167,8 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 	 public Result<IPage<SyShippingDetailsVo>> queryPageList3(
 	 								 String documentNo,
 									 String customer,
+									 String salesman,
+									 String garmentFactory,
 									 String distributionPoint,
 									 String startDate,
 									 String smallPo,
@@ -191,6 +193,12 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
 			 queryWrapper.eq("t.smallPo",smallPo);
 		 }
+		 if(oConvertUtils.isNotEmpty(salesman)){//小po
+			 queryWrapper.eq("t.salesman",salesman);
+		 }
+		 if(oConvertUtils.isNotEmpty(garmentFactory)){//小po
+			 queryWrapper.eq("t.garmentFactory",garmentFactory);
+		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始
 			 queryWrapper.ge("t.preDeliveryDate",startDate);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -426,6 +426,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	public SyLetterDepositItem typeConversion(SyPreAssembledPackingListItem syPreAssembledPackingListItem) {
 		QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("sy_pre_assembled_packing_list_item_id",syPreAssembledPackingListItem.getId());
+		queryWrapper.eq("del_flag","0");//未删除的数据
 		SyLetterDepositItem syLetterDepositItem=syLetterDepositItemMapper.selectOne(queryWrapper);//问题点
 		if(syLetterDepositItem!=null){
 			String id=syLetterDepositItem.getId();//保存预托书id防止覆盖

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

@@ -4,10 +4,8 @@ import java.io.UnsupportedEncodingException;
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17,6 +15,8 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.openApi.entity.DxpDataPlan;
+import org.jeecg.modules.openApi.service.IDxpDataPlanService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -103,7 +103,9 @@ public class SyPackingListFabricController {
 	 @GetMapping(value = "/getShippingDetails")
 	 public Result<IPage<SyShippingDetailsVo>> getShippingDetails(
 			 String documentNo,
+			 String orderNumber,
 			 String customer,
+			 String createBy,
 			 String distributionPoint,
 			 String startDate,
 			 String smallPo,
@@ -116,20 +118,26 @@ public class SyPackingListFabricController {
 		 //只有成衣才能被选中,筛选为成衣的订单,需要加个条件
 		 Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
-		 if(oConvertUtils.isNotEmpty(documentNo)) {
+		 if(oConvertUtils.isNotEmpty(documentNo)) {//单据号
 			 queryWrapper.eq("t.documentNo", documentNo);//单据号
 		 }
+		 if(oConvertUtils.isNotEmpty(orderNumber)){//订单号
+			 queryWrapper.eq("t.orderNumber", orderNumber);//订单号
+		 }
+		 if(oConvertUtils.isNotEmpty(createBy)){//制单人
+			 queryWrapper.eq("t.createBy", createBy);//制单人
+		 }
 		 if(oConvertUtils.isNotEmpty(customer)){//客户
-			 queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);
+			 queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);//客户
 		 }
 		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-			 queryWrapper.eq("t.distributionPoint",distributionPoint);
+			 queryWrapper.eq("t.distributionPoint",distributionPoint);//分销点
 		 }
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
-			 queryWrapper.eq("t.smallPo",smallPo);
+			 queryWrapper.eq("t.smallPo",smallPo);//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
-			 queryWrapper.eq("t.garmentFactory",garmentFactory);
+			 queryWrapper.eq("t.garmentFactory",garmentFactory);//成衣工厂
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始
@@ -334,74 +342,81 @@ public class SyPackingListFabricController {
 		return result;
 	}
 
-  /**
-   * 导出excel
-   *
-   * @param request
-   * @param syPackingListFabric
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, SyPackingListFabric syPackingListFabric) {
-      // Step.1 组装查询条件
-      QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
-      LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+	/**
+	* 导出excel
+	*
+	* @param request
+	* @param syPackingListFabric
+	*/
+	@RequestMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request, SyPackingListFabric syPackingListFabric) {
+	  // Step.1 组装查询条件
+	  QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
+	  LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
-      //Step.2 获取导出数据
-      List<SyPackingListFabricPage> pageList = new ArrayList<SyPackingListFabricPage>();
-      List<SyPackingListFabric> syPackingListFabricList = syPackingListFabricService.list(queryWrapper);
-      for (SyPackingListFabric temp : syPackingListFabricList) {
-          SyPackingListFabricPage vo = new SyPackingListFabricPage();
-          BeanUtils.copyProperties(temp, vo);
-          List<SyPackingListFabricItem> syPackingListFabricItemList = syPackingListFabricItemService.selectByMainId(temp.getId());
-          vo.setSyPackingListFabricItemList(syPackingListFabricItemList);
-          pageList.add(vo);
-      }
-      //Step.3 调用AutoPoi导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      mv.addObject(NormalExcelConstants.FILE_NAME, "装箱单面料");
-      mv.addObject(NormalExcelConstants.CLASS, SyPackingListFabricPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("装箱单面料数据", "导出人:"+sysUser.getRealname(), "面料装箱单"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
+	  //Step.2 获取导出数据
+	  List<SyPackingListFabricPage> pageList = new ArrayList<SyPackingListFabricPage>();
+	  List<SyPackingListFabric> syPackingListFabricList = syPackingListFabricService.list(queryWrapper);
+	  for (SyPackingListFabric temp : syPackingListFabricList) {
+		  SyPackingListFabricPage vo = new SyPackingListFabricPage();
+		  BeanUtils.copyProperties(temp, vo);
+		  List<SyPackingListFabricItem> syPackingListFabricItemList = syPackingListFabricItemService.selectByMainId(temp.getId());
+		  vo.setSyPackingListFabricItemList(syPackingListFabricItemList);
+		  pageList.add(vo);
+	  }
+	  //Step.3 调用AutoPoi导出Excel
+	  ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+	  mv.addObject(NormalExcelConstants.FILE_NAME, "装箱单面料");
+	  mv.addObject(NormalExcelConstants.CLASS, SyPackingListFabricPage.class);
+	  mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("装箱单面料数据", "导出人:"+sysUser.getRealname(), "面料装箱单"));
+	  mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+	  return mv;
+	}
 
-  /**
-   * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<SyPackingListFabricPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyPackingListFabricPage.class, params);
-              for (SyPackingListFabricPage page : list) {
-                  SyPackingListFabric po = new SyPackingListFabric();
-                  BeanUtils.copyProperties(page, po);
-                  syPackingListFabricService.saveMain(po);
-              }
-              return Result.OK("文件导入成功！数据行数:" + list.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.OK("文件导入失败！");
-  }
+	/**
+	* 通过excel导入数据
+	*
+	* @param request
+	* @param response
+	* @return
+	*/
+	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+	  MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+	  Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+	  for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+		  MultipartFile file = entity.getValue();// 获取上传文件对象
+		  ImportParams params = new ImportParams();
+		  params.setTitleRows(2);
+		  params.setHeadRows(1);
+		  params.setNeedSave(true);
+		  try {
+			  List<SyPackingListFabricPage> list = ExcelImportUtil.importExcel(file.getInputStream(), SyPackingListFabricPage.class, params);
+			  for (SyPackingListFabricPage page : list) {
+				  SyPackingListFabric po = new SyPackingListFabric();
+				  BeanUtils.copyProperties(page, po);
+				  syPackingListFabricService.saveMain(po);
+			  }
+			  return Result.OK("文件导入成功！数据行数:" + list.size());
+		  } catch (Exception e) {
+			  log.error(e.getMessage(),e);
+			  return Result.error("文件导入失败:"+e.getMessage());
+		  } finally {
+			  try {
+				  file.getInputStream().close();
+			  } catch (IOException e) {
+				  e.printStackTrace();
+			  }
+		  }
+	  }
+	  return Result.OK("文件导入失败！");
+	}
 
+	@AutoLog(value = "手动同步辅料数据")
+	@ApiOperation(value="手动同步辅料数据", notes="手动同步辅料数据")
+	@GetMapping(value = "/getU8Data")
+	public Result<?> getU8Data(){
+		syPackingListFabricService.getU8Data();
+		return Result.OK("同步成功");
+	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -136,4 +136,15 @@ public class SyPackingListFabric implements Serializable {
 	/*铅分号*/
 	@ApiModelProperty(value = "铅分号")
 	private String plumbumNo;
+
+	@ApiModelProperty(value = "是否直接从u8拉的数据")
+	//@TableField(exist = false)
+	private Integer isU8Data;
+	@ApiModelProperty(value = "u8唯一标识")
+	//@TableField(exist = false)
+	private String u8Id;
+	/**账套号*/
+	@ApiModelProperty(value = "账套号")
+	//@TableField(exist = false)
+	private String account;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -241,8 +241,8 @@ public class SyPackingListFabricItem implements Serializable {
 	@TableField(exist = false)
 	private int isAdd;
 	/**剩余数量*/
-	@Excel(name = "剩余数量", width = 15)
-	@ApiModelProperty(value = "剩余数量")
+	@Excel(name = "发运明细剩余数量", width = 15)
+	@ApiModelProperty(value = "发运明细剩余数量")
 	@TableField(exist = false)
 	private Integer surplusQuantity;
 	/**申报要素ID*/
@@ -289,4 +289,27 @@ public class SyPackingListFabricItem implements Serializable {
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
 
+	/**辅料u8唯一标识*/
+	@ApiModelProperty(value = "辅料u8唯一标识")
+	//@TableField(exist = false)
+	private String u8Id;
+	/**辅料u8唯一标识*/
+	@ApiModelProperty(value = "辅料u8主表标识")
+	//@TableField(exist = false)
+	private String u8Pid;
+	/**账套号*/
+	@ApiModelProperty(value = "账套号")
+	//@TableField(exist = false)
+	private String account;
+	/**尺码*/
+	@ApiModelProperty(value = "尺码")
+	//@TableField(exist = false)
+	private String size;
+	@ApiModelProperty(value = "销售订单子表id")
+	//@TableField(exist = false)
+	private String isosid;
+
+
+	@TableField(exist = false)
+	private String venId;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -56,9 +56,19 @@
 		SELECT
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
+			(SELECT supplier FROM sy_shipping_details_item WHERE inventory_Ccode LIKE '03%'
+			AND inventory_Ccode!='0399' AND sy_shipping_details_item.id=b.id) supplierDyeingPlant,
+			(SELECT supplier_code FROM sy_shipping_details_item WHERE inventory_Ccode LIKE '03%'
+			AND inventory_Ccode!='0399' AND sy_shipping_details_item.id=b.id) supplierCodeDyeingPlant,
+			(SELECT supplier FROM sy_shipping_details_item WHERE inventory_Ccode LIKE '04%'
+			AND inventory_Ccode!='0499' AND sy_shipping_details_item.id=b.id) supplierPrintingPlant,
+			(SELECT supplier_code FROM sy_shipping_details_item WHERE inventory_Ccode LIKE '04%'
+			AND inventory_Ccode!='0499' AND sy_shipping_details_item.id=b.id) supplierCodePrintingPlant,
+
+			b.inventory_CCode venId,/*获取物料分类*/
 			a.order_Type,
 			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
-			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
+			IF(INSTR(b.order_number,'-')>0,LEFT(b.order_number,INSTR(b.order_number,'-')-1),b.order_number) PlanLotNumber,
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
 			b.sales_Department,/*业务部门*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -5,6 +5,7 @@
     <select id="queryShippingDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
     SELECT t.* FROM(SELECT
         a.id AS id,
+        a.create_by as createBy,
         a.document_no AS documentNo,
         a.document_date AS documentDate,
         b.order_number AS orderNumber,

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

@@ -60,5 +60,5 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	//分页查询
 	IPage<SyPackingListFabric> selectPage(IPage<SyPackingListFabric> page,QueryWrapper<SyPackingListFabric> queryWrapper);
 
-
+	void getU8Data();
 }

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

@@ -1,13 +1,20 @@
 package org.jeecg.modules.splfi.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
 import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsItemMapper;
 import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
+import org.jeecg.modules.openApi.entity.DxpDataPlan;
+import org.jeecg.modules.openApi.service.IDxpDataPlanService;
+import org.jeecg.modules.openApi.service.ISenYuDataSourceOne;
+import org.jeecg.modules.openApi.service.ISenYuDataSourceThree;
+import org.jeecg.modules.openApi.service.ISenYuDataSourceTwo;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
@@ -15,6 +22,7 @@ import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricMapper;
 import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
 import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.util.JsonChangeUtils;
 import org.jeecg.modules.system.util.oConvertUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -42,13 +50,21 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	private SyPackingListFabricItemMapper syPackingListFabricItemMapper;
 	@Autowired
 	private SyShippingDetailsItemMapper syShippingDetailsItemMapper;
-	
+	@Autowired
+	private ISenYuDataSourceOne senYuDataSourceOne;
+	@Autowired
+	private ISenYuDataSourceTwo senYuDataSourceTwo;
+	@Autowired
+	private ISenYuDataSourceThree senYuDataSourceThree;
+	@Autowired
+	private IDxpDataPlanService dxpDataPlanService;
 	@Override
 	@Transactional
 	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric) {
 		SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
 		QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
 		queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
+		queryWrapperCount.eq("is_U8_Data","0");//判断是不是面料
 		queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
 		String dateNo ="ML"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
 		syPackingListFabric.setDelFlag("0");
@@ -153,9 +169,12 @@ return null;
 	public  SyPackingListFabric getSyShippingDetailsData(String[] ids,String [] groupIds) throws ParseException {
 		String time= new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis());
 		SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.getSyShippingDetailsData(ids);
-		syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
-		System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
-		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds));
+		//syPackingListFabric.setPreparedDate(new SimpleDateFormat("yyyy-MM-dd").parse(time));//获取制单日期
+		//System.out.println("ids的数据为:\t"+ids[0]+"\ngroupIds为:\t"+groupIds[0]);
+		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.getSyShippingDetailsDatas(ids,groupIds);
+
+		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItems);
+
 		return syPackingListFabric;
 	}
 
@@ -171,4 +190,136 @@ return null;
 		return syPackingListFabricMapper.queryMain(page,queryWrapper);
 	}
 
+	/**
+	 * 每3分钟拉取一次数据
+	 */
+	@Override
+	@Scheduled(fixedRate=1000*60*3)
+	//@Transactional
+	public void getU8Data() {
+		SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
+		try{
+			QueryWrapper<DxpDataPlan> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("code", "senYu_accessory_data");
+			DxpDataPlan dxpDataPlan=dxpDataPlanService.getOne(queryWrapper);
+			String time=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis());//获取现在时间
+			String lastTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(dxpDataPlan.getLastTime());
+			System.out.println("time：\t"+time);
+			System.out.println("lastTime：\t"+lastTime);
+			String [] pks=dxpDataPlan.getPkOrg().split(",");
+			for (String pk : pks){
+				String account=pk.split(":")[1];//获取账套号
+				//先插主表数据，然后根据主表id查询子表数据再添加
+				String sql="select \n" +
+						"a.id u8Id,\n" +
+						account+" as account , \n" +
+						"'1' as is_U8_Data,\n" +
+						"a.cMemo memo,\n" +
+						"a.cMaker preparedBy,\n" +
+						"a.cDefine10  exportInvoiceNo,\n" +
+						"a.dnmaketime  preparedDate\n" +
+						"from rdrecord32 a\n" +
+						"where " +
+						"cCusCode='T020001' and\n" +
+						" (select count(1) from \n" +
+						"rdrecords32 left join Inventory\n" +
+						"on rdrecords32.cInvCode=Inventory.cInvCode \n" +
+						"where rdrecords32.id=a.id\n" +
+						"and cInvCCode not like '01%'\n" +
+						"and cInvCCode not like '02%'\n" +
+						"and cInvCCode not like '03%'\n" +
+						"and cInvCCode not like '04%'\n" +
+						"and cInvCCode not like '19%')>0"+
+						"and a.dnverifytime>'"+lastTime+"'";//根据最后一次拉去时间
+				List<Map<String, Object>> listMain = new ArrayList<>();
+				System.out.println("sql：\t"+sql);
+				if(account.equals("903")){
+					listMain = senYuDataSourceThree.queryForList(sql);//903
+				}else{
+					listMain = senYuDataSourceTwo.queryForList(sql);//902
+				}
+				if (listMain.size()==0){
+					continue;//退出本次循环
+				}
+				List<JSONObject> jsonObjects = JsonChangeUtils.toJSONObject(listMain);
+				for(JSONObject json : jsonObjects){
+					SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);
+					QueryWrapper<SyPackingListFabric> queryWrapperCount=new QueryWrapper<>();
+					queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));//今天生成
+					queryWrapper.eq("is_U8_Data","1");//判断是不是辅料
+					queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
+					String dateNo ="FL"+sf.format(System.currentTimeMillis())+getOne(queryWrapperCount).getId();//获取单据号
+					sy.setDocumentNo(dateNo);//单据号
+					sy.setU8Id(account+sy.getU8Id());
+					sy.setId(sy.getU8Id());
+					syPackingListFabricMapper.insert(sy);//添加数据
+					String sql2="select " +
+							"b.AutoID as u8id ,\n" +
+							"b.id as u8pid,\n" +
+							"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
+							"b.csocode as orderNumber,\n" +
+							account+" as account,\n"+
+							"f.AutoID  as isosid,\n" +
+							"b.iQuantity  as inventoryQuantity,\n" +
+							"b.cbMemo as remarks,\n" +
+							"b.cbMemo as memo,\n" +
+							"f.iTaxUnitPrice as price,\n"+
+							"d.cPersonName as salesman,\n" +
+							"b.cDefine22 as itemNumber,\n" +
+							"b.cFree6 as gramWeight,\n" +
+							"b.cFree1 as colour,\n" +
+							"b.cInvCode as inventoryCode,\n" +
+							"c.cInvName as inventoryName,\n" +
+							"c.cInvName as composition,\n" +
+							"b.cFree2 as size ,\n" +
+							"e.cComUnitName as masterMetering,\n" +
+							"b.cFree4 as width,\n" +
+							"c.cInvStd  as specificationAndModel\n" +
+							"from rdrecord32 a \n" +
+							"left JOIN rdrecords32 b\n" +
+
+							"on a.id=b.id \n" +
+							"left join Inventory c\n" +
+							"on b.cInvCode=c.cInvCode\n" +
+							"LEFT JOIN Person  d\n" +
+							"ON d.cPersonCode = a.cPersonCode\n" +
+							"left join ComputationUnit e\n" +
+							"on c.cComunitCode=e.cComunitCode\n" +
+							"left join SO_SODetails f\n" +
+							"on b.iorderdid=f.iSOsID\n" +
+							"where cInvCCode not like '01%'\n" +
+							"and cInvCCode not like '02%'\n" +
+							"and cInvCCode not like '03%'\n" +
+							"and cInvCCode not like '04%'\n" +
+							"and cInvCCode not like '19%'\n" +
+							"and cCusCode='T020001'\n" +
+							"and a.id='"+sy.getU8Id().substring(3)+"'";
+					List<Map<String, Object>> list = new ArrayList<>();
+					String groupId=oConvertUtils.getId();//获取id
+					if(account.equals("903")){
+						list = senYuDataSourceThree.queryForList(sql2);//903
+					}else{
+						list = senYuDataSourceTwo.queryForList(sql2);//902
+					}
+					List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
+					for (JSONObject json1 :  jianSon){
+						SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
+						sy1.setU8Id(account+sy1.getU8Id());//获取账套号+id
+						sy1.setId(sy1.getU8Id());
+						sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
+						sy1.setGroupId(groupId);
+						sy1.setSyPackingListFabricId(sy.getId());//获取主表id
+						sy1.setU8Pid(sy.getU8Id());
+						syPackingListFabricItemMapper.insert(sy1);//插入新数据
+					}
+					//sys.add(sy);//集合
+				}
+			}
+			dxpDataPlanService.updateLastTime2(time,"senYu_accessory_data");//修改最后抓取时间
+		}catch (Exception e){
+			System.out.println("辅料更新失败:"+e.getMessage());
+			log.error(e.getMessage());
+		}
+		//return sys;
+	}
 }

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

@@ -89,13 +89,18 @@ public class SyPackingListTailoringController {
 								   String endDate,
 								   HttpServletRequest req) {
 		String orderNumber=syPackingListTailoringVo.getOrderNumber();//获取订单号
+		String garmentFactory=syPackingListTailoringVo.getGarmentFactory();//获取成衣工厂
 		syPackingListTailoringVo.setOrderNumber(null);//获取订单号
+		syPackingListTailoringVo.setGarmentFactory(null);//获取成衣工厂
 		QueryWrapper<SyPackingListTailoringVo> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
 		if(oConvertUtils.isNotEmpty(orderNumber)){
 			queryWrapper.eq("a.order_number",orderNumber);//查询订单号
 		}
+		if(oConvertUtils.isNotEmpty(garmentFactory)){
+			queryWrapper.eq("a.garment_Factory",garmentFactory);//查询成衣工厂
+		}
 		if(oConvertUtils.isNotEmpty(stratDate)){
 			queryWrapper.ge("b.hod",stratDate);//起始日期
 		}

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

@@ -116,6 +116,7 @@
 		ompo_Id_Item,/*采购委外订单子表id*/
 		ymoney,/*佣金*/
 		plan_Size,/*计划尺码数量*/
+		remarks,/*备注*/
 		group_id
 	FROM  sy_packing_list_tailoring_item
 	WHERE sy_packing_list_tailoring_id =#{value} AND del_flag = 0