修改云工厂推送字段

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -160,7 +160,9 @@
 	<select id="pushData" resultType="org.jeecg.modules.spapl.vo.PackingLineVo" parameterType="java.lang.String">
         SELECT
 			sort AS packingLineNum/*排序*/,
-			/*采购/委外订单行号ID（子表唯一标识）*/ id as attributeBigint1,
+			(SELECT sy_order_data_item_id 	FROM `sy_shipping_details_item` WHERE
+			id=sy_pre_assembled_packing_list_item.`sy_declaration_elements_item_id`)
+			AS  attributeBigint1,/*采购/委外订单行号ID（子表唯一标识）*/
 			style_No AS styleNo/*styleNo*/,
 			item_Code AS featureCode1/*ITEM NO./SKU NO./UPC NO./PACKS CODE*/,
 			prepack_Sku AS prepackSku/*PREPACK_SKU*/,
@@ -190,5 +192,6 @@
 			total_Price AS totalPrice/*总价*/
 		FROM sy_pre_assembled_packing_list_item
 		where sy_Pre_Assembled_Packing_List_Id=#{value}
+		ORDER BY packingLineNum
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper">
     <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
-        /*获取发运明细数据*/
+    /*获取发运明细数据*/
     SELECT
         sy_shipping_details.id AS syDeclarationElementsId, /*发运明细主表id*/
         sy_order_data.id AS syDeclarationElementsId, /*订单数据主表id*/
@@ -13,8 +13,7 @@
         sy_order_data.business_Type_Value,/*业务类型*/
         sy_order_data.salesman,/*业务员*/
         sy_order_data.sales_Department,/*业务部门(销售部门)*/
-
-        /*sy_shipping_details.garment_Factory AS garmentFactory, 成衣工厂 garmentFactory m*/
+        sy_order_data.garment_Factory AS garmentFactory, /*成衣工厂 garmentFactory m*/
         sy_shipping_details.order_Type AS  orderType, /*订单类型 m*/
         (SELECT sy_shipping_details_item.`pur_or_sub_order` FROM sy_shipping_details_item
         WHERE shipping_details_id=sy_shipping_details.id LIMIT 1) spur_Or_Sub_Order/*采购/委外订单号*/
@@ -77,14 +76,15 @@
     SELECT
         document_No AS packingHeaderNum/*单据号*/,
         spur_Or_Sub_Order AS poNo,/*委外/采购订单号*/
-        /*采购/委外订单号对应的ID（唯一标识）*/ id as attributeBigint1,
+        (SELECT sy_order_data_id FROM `sy_shipping_details` WHERE id=
+        sy_pre_assembled_packing_list.`sy_declaration_elements_id`)
+        AS attributeBigint1,/*采购/委外订单号对应的ID（唯一标识）*/
         'CLOTHING' AS packingType /*计划装箱单类型*/,
         'NEW' AS packingStatus /*计划装箱单头状态*/,
         size_Range  AS size_Range,/*尺寸范围*/
         item_number AS styleNo,/*款号*/
         product_Name AS  productName,/*品名*/
         supplier_code supplierNumber, /*供应商编码*/
-       /* customer_Code AS customerCode/*客户编码*/,*/
         create_By AS preparer/*创建人*/,
         create_Time AS preparationTime/*创建时间*/
     FROM `sy_pre_assembled_packing_list`
@@ -154,7 +154,7 @@
     WHERE
     a.del_flag = 0
     and a.state=1
-    /* and inventory_code like '19%'*/
+    /*and inventory_code like '19%'*/
     GROUP BY a.id ORDER BY a.document_no DESC) AS t
     ${ew.customSqlSegment}
     </select>

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

@@ -0,0 +1,240 @@
+package org.jeecg.modules.splfi.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.system.vo.LoginUser;
+import org.apache.shiro.SecurityUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
+import org.jeecg.modules.splfi.vo.SyPackingListFabricPage;
+import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
+import org.jeecg.modules.splfi.service.ISyPackingListFabricItemService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Api(tags="面料装箱单")
+@RestController
+@RequestMapping("/splfi/syPackingListFabric")
+@Slf4j
+public class SyPackingListFabricController {
+	@Autowired
+	private ISyPackingListFabricService syPackingListFabricService;
+	@Autowired
+	private ISyPackingListFabricItemService syPackingListFabricItemService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param syPackingListFabric
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-分页列表查询")
+	@ApiOperation(value="面料装箱单-分页列表查询", notes="面料装箱单-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<?> queryPageList(SyPackingListFabric syPackingListFabric,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, req.getParameterMap());
+		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
+		IPage<SyPackingListFabric> pageList = syPackingListFabricService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 * 添加
+	 *
+	 * @param syPackingListFabricPage
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-添加")
+	@ApiOperation(value="面料装箱单-添加", notes="面料装箱单-添加")
+	@PostMapping(value = "/add")
+	public Result<?> add(@RequestBody SyPackingListFabricPage syPackingListFabricPage) {
+		SyPackingListFabric syPackingListFabric = new SyPackingListFabric();
+		BeanUtils.copyProperties(syPackingListFabricPage, syPackingListFabric);
+		syPackingListFabricService.saveMain(syPackingListFabric, syPackingListFabricPage.getSyPackingListFabricItemList());
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 * 编辑
+	 *
+	 * @param syPackingListFabricPage
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-编辑")
+	@ApiOperation(value="面料装箱单-编辑", notes="面料装箱单-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<?> edit(@RequestBody SyPackingListFabricPage syPackingListFabricPage) {
+		SyPackingListFabric syPackingListFabric = new SyPackingListFabric();
+		BeanUtils.copyProperties(syPackingListFabricPage, syPackingListFabric);
+		syPackingListFabricService.updateMain(syPackingListFabric, syPackingListFabricPage.getSyPackingListFabricItemList());
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 * 通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-通过id删除")
+	@ApiOperation(value="面料装箱单-通过id删除", notes="面料装箱单-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
+	    syPackingListFabricService.delMain(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 * 批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-批量删除")
+	@ApiOperation(value="面料装箱单-批量删除", notes="面料装箱单-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.syPackingListFabricService.delBatchMain(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功！");
+	}
+	
+	/**
+	 * 通过id查询
+     *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-通过id查询")
+	@ApiOperation(value="面料装箱单-通过id查询", notes="面料装箱单-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
+		SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(id);
+		return Result.OK(syPackingListFabric);
+	}
+	
+	/**
+	 * 通过id查询
+     *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "面料装箱单-通过主表ID查询")
+	@ApiOperation(value="面料装箱单-通过主表ID查询", notes="面料装箱单-通过主表ID查询")
+	@GetMapping(value = "/querySyPackingListFabricItemByMainId")
+	public Result<?> querySyPackingListFabricItemListByMainId(@RequestParam(name="id",required=true) String id) {
+		List<SyPackingListFabricItem> syPackingListFabricItemList = syPackingListFabricItemService.selectByMainId(id);
+		return Result.OK(syPackingListFabricItemList);
+	}
+
+  /**
+   * 导出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;
+  }
+
+  /**
+   * 通过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, page.getSyPackingListFabricItemList());
+              }
+              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("文件导入失败！");
+  }
+
+}

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

@@ -0,0 +1,92 @@
+package org.jeecg.modules.splfi.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_packing_list_fabric")
+@ApiModel(value="sy_packing_list_fabric对象", description="面料装箱单")
+public class SyPackingListFabric implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "id")
+	private java.lang.String id;
+	/**创建人*/
+	@ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**修改人*/
+	@ApiModelProperty(value = "修改人")
+	private java.lang.String updateBy;
+	/**修改日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "修改日期")
+	private java.util.Date updateTime;
+	/**组织*/
+	@ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+	@ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**备注*/
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+	/**订单号*/
+	@ApiModelProperty(value = "订单号")
+	private java.lang.String orderNumber;
+	/**集装箱号*/
+	@ApiModelProperty(value = "集装箱号")
+	private java.lang.String containerNumber;
+	/**装柜日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "装柜日期")
+	private java.util.Date loadingDate;
+	/**成衣工厂*/
+	@ApiModelProperty(value = "成衣工厂")
+	private java.lang.String theGarmentFactory;
+	/**发票号*/
+	@ApiModelProperty(value = "发票号")
+	private java.lang.String invoiceNo;
+	/**制单人*/
+	@ApiModelProperty(value = "制单人")
+	private java.lang.String preparedBy;
+	/**制单日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "制单日期")
+	private java.util.Date preparedDate;
+	/**外销发票号*/
+	@ApiModelProperty(value = "外销发票号")
+	private java.lang.String exportInvoiceNo;
+	/**托书号*/
+	@ApiModelProperty(value = "托书号")
+	private java.lang.String joeBookNumber;
+	/**预托书号*/
+	@ApiModelProperty(value = "预托书号")
+	private java.lang.String underpinningOfBookNumber;
+	/**备注*/
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object remarks;
+}

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

@@ -0,0 +1,210 @@
+package org.jeecg.modules.splfi.entity;
+
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("sy_packing_list_fabric_item")
+@ApiModel(value="sy_packing_list_fabric对象", description="面料装箱单")
+public class SyPackingListFabricItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+	@ApiModelProperty(value = "id")
+	private java.lang.String id;
+	/**装箱单面料主表id*/
+	@ApiModelProperty(value = "装箱单面料主表id")
+	private java.lang.String syPackingListFabricId;
+	/**业务员*/
+    @Excel(name = "业务员", width = 15)
+	@ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+	/**计划单号*/
+    @Excel(name = "计划单号", width = 15)
+	@ApiModelProperty(value = "计划单号")
+	private java.lang.String orderNumber;
+	/**款号/Kimball*/
+    @Excel(name = "款号/Kimball", width = 15)
+	@ApiModelProperty(value = "款号/Kimball")
+	private java.lang.String styleNumber;
+	/**缸号/Batch no.*/
+    @Excel(name = "缸号/Batch no.", width = 15)
+	@ApiModelProperty(value = "缸号/Batch no.")
+	private java.lang.String dyelotNumber;
+	/**颜色/color*/
+    @Excel(name = "颜色/color", width = 15)
+	@ApiModelProperty(value = "颜色/color")
+	private java.lang.String color;
+	/**项目/Item（存货编码）*/
+    @Excel(name = "项目/Item（存货编码）", width = 15)
+	@ApiModelProperty(value = "项目/Item（存货编码）")
+	private java.lang.String project;
+	/**存货名称（辅料名称）*/
+    @Excel(name = "存货名称（辅料名称）", width = 15)
+	@ApiModelProperty(value = "存货名称（辅料名称）")
+	private java.lang.String accessoriesName;
+	/**报关品名*/
+    @Excel(name = "报关品名", width = 15)
+	@ApiModelProperty(value = "报关品名")
+	private java.lang.String customsDeclarationItems;
+	/**成分/Composition*/
+    @Excel(name = "成分/Composition", width = 15)
+	@ApiModelProperty(value = "成分/Composition")
+	private java.lang.String composition;
+	/**门幅/Width*/
+    @Excel(name = "门幅/Width", width = 15)
+	@ApiModelProperty(value = "门幅/Width")
+	private java.lang.String width;
+	/**匹数/Rolls*/
+    @Excel(name = "匹数/Rolls", width = 15)
+	@ApiModelProperty(value = "匹数/Rolls")
+	private java.lang.String rolls;
+	/**毛重/GW/kg*/
+    @Excel(name = "毛重/GW/kg", width = 15)
+	@ApiModelProperty(value = "毛重/GW/kg")
+	private java.math.BigDecimal grossWeight;
+	/**净重/NW/kg*/
+    @Excel(name = "净重/NW/kg", width = 15)
+	@ApiModelProperty(value = "净重/NW/kg")
+	private java.math.BigDecimal netWeight;
+	/**染后重*/
+    @Excel(name = "染后重", width = 15)
+	@ApiModelProperty(value = "染后重")
+	private java.math.BigDecimal afterHeavy;
+	/**拷布重*/
+    @Excel(name = "拷布重", width = 15)
+	@ApiModelProperty(value = "拷布重")
+	private java.math.BigDecimal kaoClothWeight;
+	/**米数/Length/m */
+    @Excel(name = "米数/Length/m ", width = 15)
+	@ApiModelProperty(value = "米数/Length/m ")
+	private java.math.BigDecimal meter;
+	/**价格*/
+    @Excel(name = "价格", width = 15)
+	@ApiModelProperty(value = "价格")
+	private java.math.BigDecimal price;
+	/**克重/G*/
+    @Excel(name = "克重/G", width = 15)
+	@ApiModelProperty(value = "克重/G")
+	private java.math.BigDecimal gramWeight;
+	/**供应商编码（染厂）*/
+    @Excel(name = "供应商编码（染厂）", width = 15)
+	@ApiModelProperty(value = "供应商编码（染厂）")
+	private java.lang.String supplierCodeDyeingPlant;
+	/**供应商（染厂）*/
+    @Excel(name = "供应商（染厂）", width = 15)
+	@ApiModelProperty(value = "供应商（染厂）")
+	private java.lang.String supplierDyeingPlant;
+	/**供应商编码（印厂）*/
+    @Excel(name = "供应商编码（印厂）", width = 15)
+	@ApiModelProperty(value = "供应商编码（印厂）")
+	private java.lang.String supplierCodePrintingPlant;
+	/**供应商（印厂）*/
+    @Excel(name = "供应商（印厂）", width = 15)
+	@ApiModelProperty(value = "供应商（印厂）")
+	private java.lang.String supplierPrintingPlant;
+	/**包装方式*/
+    @Excel(name = "包装方式", width = 15)
+	@ApiModelProperty(value = "包装方式")
+	private java.lang.String mannerOfPacking;
+	/**处理方式*/
+    @Excel(name = "处理方式", width = 15)
+	@ApiModelProperty(value = "处理方式")
+	private java.lang.String processMode;
+	/**是否手册纱*/
+    @Excel(name = "是否手册纱", width = 15)
+	@ApiModelProperty(value = "是否手册纱")
+	private java.lang.String manualYarn;
+	/**手册纱单价*/
+    @Excel(name = "手册纱单价", width = 15)
+	@ApiModelProperty(value = "手册纱单价")
+	private java.math.BigDecimal unitPriceOfManual yarn;
+	/**手册纱占比*/
+    @Excel(name = "手册纱占比", width = 15)
+	@ApiModelProperty(value = "手册纱占比")
+	private java.math.BigDecimal manualYarnRatio;
+	/**柜号*/
+    @Excel(name = "柜号", width = 15)
+	@ApiModelProperty(value = "柜号")
+	private java.lang.String containerNumber;
+	/**备注*/
+    @Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object remarks1;
+	/**入库数量*/
+    @Excel(name = "入库数量", width = 15)
+	@ApiModelProperty(value = "入库数量")
+	private java.math.BigDecimal inventoryQuantity;
+	/**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+	@ApiModelProperty(value = "规格型号")
+	private java.lang.String specificationsAndModels;
+	/**实际报关数量*/
+    @Excel(name = "实际报关数量", width = 15)
+	@ApiModelProperty(value = "实际报关数量")
+	private java.math.BigDecimal actualDeclaredQuantity;
+	/**超发*/
+    @Excel(name = "超发", width = 15)
+	@ApiModelProperty(value = "超发")
+	private java.math.BigDecimal multipleShipments;
+	/**单位*/
+    @Excel(name = "单位", width = 15)
+	@ApiModelProperty(value = "单位")
+	private java.lang.String unit;
+	/**备注（U8）*/
+    @Excel(name = "备注（U8）", width = 15)
+	@ApiModelProperty(value = "备注（U8）")
+	private java.lang.Object remarks2;
+	/**创建人*/
+    @Excel(name = "创建人", width = 15)
+	@ApiModelProperty(value = "创建人")
+	private java.lang.String createBy;
+	/**创建日期*/
+	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "创建日期")
+	private java.util.Date createTime;
+	/**修改人*/
+    @Excel(name = "修改人", width = 15)
+	@ApiModelProperty(value = "修改人")
+	private java.lang.String updateBy;
+	/**修改日期*/
+	@Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "修改日期")
+	private java.util.Date updateTime;
+	/**组织*/
+    @Excel(name = "组织", width = 15)
+	@ApiModelProperty(value = "组织")
+	private java.lang.String pkOrg;
+	/**删除状态*/
+    @Excel(name = "删除状态", width = 15)
+	@ApiModelProperty(value = "删除状态")
+	private java.lang.String delFlag;
+	/**备注*/
+    @Excel(name = "备注", width = 15)
+	@ApiModelProperty(value = "备注")
+	private java.lang.Object memo;
+	/**排序*/
+    @Excel(name = "排序", width = 15)
+	@ApiModelProperty(value = "排序")
+	private java.lang.Integer sort;
+}

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

@@ -0,0 +1,18 @@
+package org.jeecg.modules.splfi.mapper;
+
+import java.util.List;
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+public interface SyPackingListFabricItemMapper extends BaseMapper<SyPackingListFabricItem> {
+
+	public boolean deleteByMainId(String mainId);
+    
+	public List<SyPackingListFabricItem> selectByMainId(String mainId);
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.splfi.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+public interface SyPackingListFabricMapper extends BaseMapper<SyPackingListFabric> {
+
+}

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_packing_list_fabric_item 
+		WHERE
+			 sy_packing_list_fabric_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
+		SELECT * 
+		FROM  sy_packing_list_fabric_item
+		WHERE
+			 sy_packing_list_fabric_id = #{id} 		
+	</select>
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.splfi.mapper.SyPackingListFabricMapper">
+
+</mapper>

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

@@ -0,0 +1,16 @@
+package org.jeecg.modules.splfi.service;
+
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+public interface ISyPackingListFabricItemService extends IService<SyPackingListFabricItem> {
+
+	public List<SyPackingListFabricItem> selectByMainId(String mainId);
+}

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

@@ -0,0 +1,40 @@
+package org.jeecg.modules.splfi.service;
+
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+public interface ISyPackingListFabricService extends IService<SyPackingListFabric> {
+
+	/**
+	 * 添加一对多
+	 * 
+	 */
+	public void saveMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList) ;
+	
+	/**
+	 * 修改一对多
+	 * 
+	 */
+	public void updateMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList);
+	
+	/**
+	 * 删除一对多
+	 */
+	public void delMain (String id);
+	
+	/**
+	 * 批量删除一对多
+	 */
+	public void delBatchMain (Collection<? extends Serializable> idList);
+	
+}

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

@@ -0,0 +1,27 @@
+package org.jeecg.modules.splfi.service.impl;
+
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
+import org.jeecg.modules.splfi.service.ISyPackingListFabricItemService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Service
+public class SyPackingListFabricItemServiceImpl extends ServiceImpl<SyPackingListFabricItemMapper, SyPackingListFabricItem> implements ISyPackingListFabricItemService {
+	
+	@Autowired
+	private SyPackingListFabricItemMapper syPackingListFabricItemMapper;
+	
+	@Override
+	public List<SyPackingListFabricItem> selectByMainId(String mainId) {
+		return syPackingListFabricItemMapper.selectByMainId(mainId);
+	}
+}

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

@@ -0,0 +1,73 @@
+package org.jeecg.modules.splfi.service.impl;
+
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
+import org.jeecg.modules.splfi.mapper.SyPackingListFabricMapper;
+import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Collection;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Service
+public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFabricMapper, SyPackingListFabric> implements ISyPackingListFabricService {
+
+	@Autowired
+	private SyPackingListFabricMapper syPackingListFabricMapper;
+	@Autowired
+	private SyPackingListFabricItemMapper syPackingListFabricItemMapper;
+	
+	@Override
+	@Transactional
+	public void saveMain(SyPackingListFabric syPackingListFabric, List<SyPackingListFabricItem> syPackingListFabricItemList) {
+		syPackingListFabricMapper.insert(syPackingListFabric);
+		for(SyPackingListFabricItem entity:syPackingListFabricItemList) {
+			//外键设置
+			entity.setSyPackingListFabricId(syPackingListFabric.getId());
+			syPackingListFabricItemMapper.insert(entity);
+		}
+	}
+
+	@Override
+	@Transactional
+	public void updateMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList) {
+		syPackingListFabricMapper.updateById(syPackingListFabric);
+		
+		//1.先删除子表数据
+		syPackingListFabricItemMapper.deleteByMainId(syPackingListFabric.getId());
+		
+		//2.子表数据重新插入
+		for(SyPackingListFabricItem entity:syPackingListFabricItemList) {
+			//外键设置
+			entity.setSyPackingListFabricId(syPackingListFabric.getId());
+			syPackingListFabricItemMapper.insert(entity);
+		}
+	}
+
+	@Override
+	@Transactional
+	public void delMain(String id) {
+		syPackingListFabricItemMapper.deleteByMainId(id);
+		syPackingListFabricMapper.deleteById(id);
+	}
+
+	@Override
+	@Transactional
+	public void delBatchMain(Collection<? extends Serializable> idList) {
+		for(Serializable id:idList) {
+			syPackingListFabricItemMapper.deleteByMainId(id.toString());
+			syPackingListFabricMapper.deleteById(id);
+		}
+	}
+	
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/vo/SyPackingListFabricPage.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.splfi.vo;
+
+import java.util.List;
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
+import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description: 面料装箱单
+ * @Author: jeecg-boot
+ * @Date:   2022-07-27
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="sy_packing_list_fabricPage对象", description="面料装箱单")
+public class SyPackingListFabricPage {
+	
+	/**id*/
+	private java.lang.String id;
+	/**创建人*/
+  	@Excel(name = "创建人", width = 15)
+	private java.lang.String createBy;
+	/**创建日期*/
+  	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date createTime;
+	/**修改人*/
+  	@Excel(name = "修改人", width = 15)
+	private java.lang.String updateBy;
+	/**修改日期*/
+  	@Excel(name = "修改日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date updateTime;
+	/**组织*/
+  	@Excel(name = "组织", width = 15)
+	private java.lang.String pkOrg;
+	/**删除状态*/
+  	@Excel(name = "删除状态", width = 15)
+	private java.lang.String delFlag;
+	/**备注*/
+  	@Excel(name = "备注", width = 15)
+	private java.lang.Object memo;
+	/**订单号*/
+  	@Excel(name = "订单号", width = 15)
+	private java.lang.String orderNumber;
+	/**集装箱号*/
+  	@Excel(name = "集装箱号", width = 15)
+	private java.lang.String containerNumber;
+	/**装柜日期*/
+  	@Excel(name = "装柜日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date loadingDate;
+	/**成衣工厂*/
+  	@Excel(name = "成衣工厂", width = 15)
+	private java.lang.String theGarmentFactory;
+	/**发票号*/
+  	@Excel(name = "发票号", width = 15)
+	private java.lang.String invoiceNo;
+	/**制单人*/
+  	@Excel(name = "制单人", width = 15)
+	private java.lang.String preparedBy;
+	/**制单日期*/
+  	@Excel(name = "制单日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	private java.util.Date preparedDate;
+	/**外销发票号*/
+  	@Excel(name = "外销发票号", width = 15)
+	private java.lang.String exportInvoiceNo;
+	/**托书号*/
+  	@Excel(name = "托书号", width = 15)
+	private java.lang.String joeBookNumber;
+	/**预托书号*/
+  	@Excel(name = "预托书号", width = 15)
+	private java.lang.String underpinningOfBookNumber;
+	/**备注*/
+  	@Excel(name = "备注", width = 15)
+	private java.lang.Object remarks;
+	
+	@ExcelCollection(name="面料装箱单")
+	@ApiModelProperty(value = "面料装箱单")
+	private List<SyPackingListFabricItem> syPackingListFabricItemList;
+	
+}