装箱单面料添加单据号

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

@@ -12,6 +12,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 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.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -20,7 +22,6 @@ 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;
@@ -42,12 +43,12 @@ import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 面料装箱单
+ * @Description: 装箱单面料
  * @Author: jeecg-boot
  * @Date:   2022-07-27
  * @Version: V1.0
  */
-@Api(tags="面料装箱单")
+@Api(tags="装箱单面料")
 @RestController
 @RequestMapping("/splfi/syPackingListFabric")
 @Slf4j
@@ -66,49 +67,116 @@ public class SyPackingListFabricController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-分页列表查询")
-	@ApiOperation(value="面料装箱单-分页列表查询", notes="面料装箱单-分页列表查询")
+	@AutoLog(value = "装箱单面料-分页列表查询")
+	@ApiOperation(value="装箱单面料-分页列表查询", notes="装箱单面料-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(SyPackingListFabric syPackingListFabric,
+	public Result<IPage<SyPackingListFabric>> queryPageList(SyPackingListFabric syPackingListFabric,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		Result<IPage<SyPackingListFabric>> result= new Result();
 		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);
+		return result.OK(pageList);
 	}
-	
+
+	 @AutoLog(value = "参照发运明细")
+	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
+	 @GetMapping(value = "/getShippingDetails")
+	 public Result<IPage<SyShippingDetailsVo>> getShippingDetails(
+			 @RequestParam(name="documentNo",required = false) String documentNo,
+			 @RequestParam(name="chineseName",required = false) String chineseName,
+			 @RequestParam(name="status", defaultValue="y") String status,
+			 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+			 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+			 HttpServletRequest req) {
+		 //只有成衣才能被选中,筛选为成衣的订单,需要加个条件
+		 Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
+		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
+		 if(oConvertUtils.isNotEmpty(documentNo)) {
+			 queryWrapper.eq("t.documentNo", documentNo);//单据号
+		 }
+		 if(oConvertUtils.isNotEmpty(chineseName)){
+			 queryWrapper.eq("t.chineseName",chineseName);//品名
+		 }
+/*		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
+			 if(status.equals("n")){
+				 queryWrapper.ge("t.excess_quantity",0);//大于等于--超发
+			 }else{
+				 queryWrapper.le("t.excess_quantity",-1);//小于等于--正常
+			 }
+		 }*/
+		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
+		 IPage<SyShippingDetailsVo> pageList = syPackingListFabricService.queryShippingDetails(page, queryWrapper);
+		 result.setSuccess(true);
+		 result.setResult(pageList);
+		 result.setMessage("查询成功");
+		 return result;
+	 }
+
+	 @AutoLog(value = "提供发运明细id获取数据")
+	 @ApiOperation(value="提供发运明细id获取数据", notes="提供发运明细id获取数据")
+	 @GetMapping(value = "/getShippingDetailId")
+	 public Result<SyPackingListFabric>  getSyShippingDetailsData(String id){
+		Result<SyPackingListFabric> result=new Result<>();
+		if(oConvertUtils.isEmpty(id)){
+			result.setMessage("id不能为空");
+			result.setSuccess(false);
+			return result;
+		}
+		result.setResult(syPackingListFabricService.getSyShippingDetailsData(id));
+		result.setSuccess(true);
+		result.setMessage("成功");
+		return result;
+	 }
+
 	/**
 	 * 添加
 	 *
-	 * @param syPackingListFabricPage
+	 * @param syPackingListFabric
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-添加")
-	@ApiOperation(value="面料装箱单-添加", notes="面料装箱单-添加")
+	@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("添加成功!");
+	public Result<SyPackingListFabric> add(@RequestBody SyPackingListFabric syPackingListFabric) {
+		Result<SyPackingListFabric> result=new Result<>();
+		if(oConvertUtils.isEmpty(syPackingListFabric)){
+			result.setSuccess(false);
+			result.setMessage("请填写信息再提交");
+			result.setResult(null);
+			return result;
+		}
+		syPackingListFabricService.saveMain(syPackingListFabric, syPackingListFabric.getSyPackingListFabricItem());
+		result.setSuccess(true);
+		result.setMessage("添加成功");
+		result.setResult(syPackingListFabric);
+		return result;
 	}
 	
 	/**
 	 * 编辑
 	 *
-	 * @param syPackingListFabricPage
+	 * @param syPackingListFabric
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-编辑")
-	@ApiOperation(value="面料装箱单-编辑", notes="面料装箱单-编辑")
+	@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("编辑成功!");
+	public Result<?> edit(@RequestBody SyPackingListFabric syPackingListFabric) {
+		Result<SyPackingListFabric> result=new Result<>();
+		if (oConvertUtils.isEmpty(syPackingListFabric)){
+			result.setSuccess(false);
+			result.setMessage("请填写信息再提交");
+			result.setResult(null);
+			return result;
+		}
+		syPackingListFabricService.updateMain(syPackingListFabric, syPackingListFabric.getSyPackingListFabricItem());
+		result.setSuccess(true);
+		result.setMessage("编辑成功");
+		result.setResult(syPackingListFabric);
+		return result;
 	}
 	
 	/**
@@ -117,8 +185,8 @@ public class SyPackingListFabricController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-通过id删除")
-	@ApiOperation(value="面料装箱单-通过id删除", notes="面料装箱单-通过id删除")
+	@AutoLog(value = "装箱单面料-通过id删除")
+	@ApiOperation(value="装箱单面料-通过id删除", notes="装箱单面料-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
 	    syPackingListFabricService.delMain(id);
@@ -131,8 +199,8 @@ public class SyPackingListFabricController {
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-批量删除")
-	@ApiOperation(value="面料装箱单-批量删除", notes="面料装箱单-批量删除")
+	@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(",")));
@@ -145,12 +213,21 @@ public class SyPackingListFabricController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-通过id查询")
-	@ApiOperation(value="面料装箱单-通过id查询", notes="面料装箱单-通过id查询")
+	@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);
+	public Result<SyPackingListFabric> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<SyPackingListFabric> result=new Result<>();
+		if(oConvertUtils.isEmpty(id)){
+			result.setSuccess(false);
+			result.setMessage("id为空");
+			return result;
+		}
+		SyPackingListFabric syPackingListFabric = syPackingListFabricService.selectById(id);
+		result.setSuccess(true);
+		result.setMessage("查询成功");
+		result.setResult(syPackingListFabric);
+		return result;
 	}
 	
 	/**
@@ -159,8 +236,8 @@ public class SyPackingListFabricController {
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "面料装箱单-通过主表ID查询")
-	@ApiOperation(value="面料装箱单-通过主表ID查询", notes="面料装箱单-通过主表ID查询")
+	@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);
@@ -191,9 +268,9 @@ public class SyPackingListFabricController {
       }
       //Step.3 调用AutoPoi导出Excel
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      mv.addObject(NormalExcelConstants.FILE_NAME, "面料装箱单");
+      mv.addObject(NormalExcelConstants.FILE_NAME, "装箱单面料");
       mv.addObject(NormalExcelConstants.CLASS, SyPackingListFabricPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("面料装箱单数据", "导出人:"+sysUser.getRealname(), "面料装箱单"));
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("装箱单面料数据", "导出人:"+sysUser.getRealname(), "面料装箱单"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
   }
@@ -237,4 +314,4 @@ public class SyPackingListFabricController {
       return Result.OK("文件导入失败！");
   }
 
-}
+}

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

@@ -2,7 +2,10 @@ package org.jeecg.modules.splfi.entity;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -19,74 +22,88 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @Data
 @TableName("sy_packing_list_fabric")
-@ApiModel(value="sy_packing_list_fabric对象", description="面料装箱单")
+@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;
+	private String id;
+	/**发运明细主表id*/
+	@ApiModelProperty(value = "发运明细主表id")
+	private String syDeclarationElementsId;
+	/**单据号*/
+	@ApiModelProperty(value = "单据号")
+	private String documentNo;
 	/**创建人*/
 	@ApiModelProperty(value = "创建人")
-	private java.lang.String createBy;
+	private 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;
+	private Date createTime;
 	/**修改人*/
 	@ApiModelProperty(value = "修改人")
-	private java.lang.String updateBy;
+	private 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;
+	private Date updateTime;
 	/**组织*/
 	@ApiModelProperty(value = "组织")
-	private java.lang.String pkOrg;
+	private String pkOrg;
 	/**删除状态*/
 	@ApiModelProperty(value = "删除状态")
-	private java.lang.String delFlag;
+	private String delFlag;
 	/**备注*/
 	@ApiModelProperty(value = "备注")
-	private java.lang.Object memo;
+	private Object memo;
 	/**订单号*/
 	@ApiModelProperty(value = "订单号")
-	private java.lang.String orderNumber;
+	private String orderNumber;
 	/**集装箱号*/
 	@ApiModelProperty(value = "集装箱号")
-	private java.lang.String containerNumber;
+	private 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;
+	private Date latestDateOfShipment;
 	/**成衣工厂*/
 	@ApiModelProperty(value = "成衣工厂")
-	private java.lang.String theGarmentFactory;
+	private String garmentFactory;
 	/**发票号*/
 	@ApiModelProperty(value = "发票号")
-	private java.lang.String invoiceNo;
+	private String invoiceNo;
 	/**制单人*/
 	@ApiModelProperty(value = "制单人")
-	private java.lang.String preparedBy;
+	private 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;
+	private Date preparedDate;
 	/**外销发票号*/
 	@ApiModelProperty(value = "外销发票号")
-	private java.lang.String exportInvoiceNo;
+	private String exportInvoiceNo;
 	/**托书号*/
 	@ApiModelProperty(value = "托书号")
-	private java.lang.String joeBookNumber;
+	private String shippingOrderNumber;
 	/**预托书号*/
 	@ApiModelProperty(value = "预托书号")
-	private java.lang.String underpinningOfBookNumber;
+	private String depositaryReceiptNo;
 	/**备注*/
 	@ApiModelProperty(value = "备注")
-	private java.lang.Object remarks;
+	private Object remarks;
+	/**附件*/
+	@ApiModelProperty(value = "附件")
+	private String accessory;
+
+	/**子表数据*/
+	@TableField(exist = false)
+	@ApiModelProperty(value = "子表数据")
+	private List<SyPackingListFabricItem> syPackingListFabricItem;
 }

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

@@ -46,7 +46,7 @@ public class SyPackingListFabricItem implements Serializable {
 	/**计划单号*/
     @Excel(name = "计划单号", width = 15)
 	@ApiModelProperty(value = "计划单号")
-	private String PlanLotNumber;
+	private String planLotNumber;
 	/**款号/Kimball*/
     @Excel(name = "款号/Kimball", width = 15)
 	@ApiModelProperty(value = "款号/Kimball")
@@ -78,11 +78,11 @@ public class SyPackingListFabricItem implements Serializable {
 	/**门幅/Width*/
     @Excel(name = "门幅/Width", width = 15)
 	@ApiModelProperty(value = "门幅/Width")
-	private String width;
+	private java.math.BigDecimal width;
 	/**匹数/Rolls*/
     @Excel(name = "匹数/Rolls", width = 15)
 	@ApiModelProperty(value = "匹数/Rolls")
-	private String rolls;
+	private java.math.BigDecimal rolls;
 	/**毛重/GW/kg*/
     @Excel(name = "毛重/GW/kg", width = 15)
 	@ApiModelProperty(value = "毛重/GW/kg")
@@ -207,6 +207,10 @@ public class SyPackingListFabricItem implements Serializable {
     @Excel(name = "删除状态", width = 15)
 	@ApiModelProperty(value = "删除状态")
 	private String delFlag;
+	/**分组ID*/
+	@Excel(name = "分组ID", width = 15)
+	@ApiModelProperty(value = "分组ID")
+	private String groupId;
 	/**备注*/
     @Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.splfi.mapper;
 
 import java.util.List;
+
+import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -15,4 +17,9 @@ public interface SyPackingListFabricItemMapper extends BaseMapper<SyPackingListF
 	public boolean deleteByMainId(String mainId);
     
 	public List<SyPackingListFabricItem> selectByMainId(String mainId);
+
+	public List<SyPackingListFabricItem> selectByMainId2(String mainId);
+
+	//根据id获取发运明细数据
+	public List<SyPackingListFabricItem> getSyShippingDetailsData(String id);
 }

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

@@ -2,7 +2,10 @@ package org.jeecg.modules.splfi.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -13,5 +16,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface SyPackingListFabricMapper extends BaseMapper<SyPackingListFabric> {
+    //发运明细分页列表查询
+    public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, @Param("ew") QueryWrapper<SyShippingDetailsVo> queryWrapper);
 
+    //根据id获取发运明细数据
+    public SyPackingListFabric getSyShippingDetailsData(String id);
+
+    //将该单据修改成删除状态
+    public int deleteByMainId(String id);
 }

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

@@ -3,10 +3,7 @@
 <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} 		
+		update sy_packing_list_fabric_item set del_flag=1 where sy_packing_list_fabric_id=#{value}
 	</delete>
 	
 	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
@@ -15,4 +12,79 @@
 		WHERE
 			 sy_packing_list_fabric_id = #{id} 		
 	</select>
+
+	<select id="getSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
+		SELECT
+			a.id as syDeclarationElementsId,
+			b.id as syDeclarationElementsItemId,
+			IF(INSTR(c.OMPO_id,'-')>0,LEFT(c.OMPO_id,INSTR(c.OMPO_id,'-')-1),c.OMPO_id) PlanLotNumber,
+			a.declaration_Name,/*报关品名*/
+			c.master_Metering,/*主计量*/
+			b.salesman,/*业务员*/
+			b.item_Number,/*款号*/
+			b.colour,/*颜色*/
+			b.inventory_Code,/*物料编码*/
+			b.inventory_Name,/*物料名称*/
+			b.material_Composition AS Composition,/*成分/Composition*/
+			b.guangpei_Gate_Width AS Width,/*门幅/Width*/
+			b.sales_Unit_Price AS price,/*价格*/
+			b.treatment_Method,/*处理方式*/
+			b.manual_Yarn_Flag,/*是否手册纱*/
+			b.manual_Yarn_Unit_Price,/*手册纱单价*/
+			b.manual_Yarn_Proportion,/*手册纱占比*/
+			b.shipment_Quantity AS inventoryQuantity,/*入库数量*/
+			b.specification_And_Model,/*规格型号*/
+			b.excess_Quantity	/*excessQuantity*/
+		FROM
+		sy_shipping_details a
+		LEFT JOIN `sy_shipping_details_item` b
+		ON a.id=b.shipping_details_id
+		AND b.del_flag=0
+		LEFT JOIN sy_order_data_item c
+		ON b.sy_order_data_item_id=c.id
+		AND c.del_flag=0
+		where a.id=#{value}
+	</select>
+
+	<select id="selectByMainId2" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabricItem">
+		SELECT
+			id,
+			sy_packing_list_fabric_id,
+			salesman,
+			plan_lot_number,
+			item_number,
+			dyelot_number,
+			colour,
+			inventory_code,
+			inventory_name,
+			declaration_name,
+			composition,
+			SUM(width) as width,
+			rolls,
+			gross_weight,
+			net_weight,
+			after_heavy,
+			kao_cloth_weight,
+			meter,
+			price,
+			gram_weight,
+			supplier_code_dyeing_plant,
+			supplier_dyeing_plant,
+			supplier_code_printing_plant,
+			supplier_printing_plant,
+			manner_of_packing,
+			treatment_method,
+			manual_yarn_flag,
+			manual_yarn_unit_price,
+			manual_yarn_proportion,
+			container_number,
+			inventory_quantity,
+			specification_and_model,
+			actual_declared_quantity,
+			excess_quantity,
+			master_metering
+		FROM `sy_packing_list_fabric_item`
+		where del_flag=0 and
+		sy_packing_list_fabric_id=#{value}
+	</select>
 </mapper>

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

@@ -1,5 +1,87 @@
 <?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">
+    <!--参照发运明细-->
+    <select id="queryShippingDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
+    SELECT t.* FROM(SELECT
+        a.id AS id,
+        a.document_no AS documentNo,
+        a.document_date AS documentDate,
+        b.order_number AS orderNumber,
+        a.push_state,a.state,
+        b.customer_abbreviation AS customerAbbreviation,
+        b.sales_department AS salesDepartment,
+        b.salesman AS salesman,
+        a.customer AS customer,
+        b.small_po AS smallPo,
+        b.pack_id AS packId,
+        b.pre_delivery_date AS preDeliveryDate,
+        a.declaration_name AS declarationName,
+        b.order_date AS orderDate,
+        b.shipment_quantity AS shipmentQuantity,
+        b.customs_declaration_unit_price AS customsDeclarationUnitPrice,
+        b.order_quantity AS orderQuantity,
+        b.is_tc AS isTc,
+        a.hs_code AS hsCode,
+        b.distribution_point AS distributionPoint,
+        b.item_number AS itemNumber,
+        b.business_type_text AS businessTypeText,
+        b.arrival_date AS arrivalDate,
+        b.inventory_name AS inventoryName,
+        b.sales_unit_price AS salesUnitPrice,
+        b.order_remaining_quantity AS orderRemainingQuantity,
+        b.pur_or_sub_order AS purOrSubOrder,
+        a.order_type AS orderType,
+        b.factory_unit_price AS factoryUnitPrice,
+        b.third_party AS thirdParty,
+        b.customer_order AS customerOrder,
+        b.material_composition AS materialComposition,
+        b.currency_text AS currencyText,
+        b.brand_side AS brandSide,
+        b.deposit_ratio AS depositRatio,
+        b.deposit AS deposit,
+        b.collaborative_route AS collaborativeRoute,
+        b.term_of_payment AS termOfPayment,
+        b.end_customer AS endCustomer,
+        b.order_remarks AS orderRemarks,
+        b.price_remarks AS priceRemarks,
+        b.order_change_description AS orderChangeDescription,
+        b.pre_completion_date AS preCompletionDate,
+        b.sales_type_text AS salesTypeText,
+        b.customer_name AS customerName,
+        b.exchange_rate AS exchangeRate,
+        a.whole_order_total AS wholeOrderTotal,
+        b.declaration_elements AS declarationElements,
+        b.number_of_sets AS numberOfSets,
+        a.chinese_name AS chineseName,
+        b.account AS account,
+        a.english_product_name AS englishProductName,
+        b.garment_factory AS garmentFactory,
+        excess_quantity
+        FROM sy_shipping_details a
+        LEFT JOIN sy_shipping_details_item b
+    ON a.id = b.shipping_details_id AND b.del_flag = 0
+    WHERE  a.del_flag = 0  /*查询未删除的数据*/
+    /*and a.state=1*/  /*查询已提交的数据*/
+    AND ( inventory_ccode NOT LIKE '19%' OR inventory_ccode IS NULL)/*查询不是成衣的数据*/
+    ORDER BY a.document_no DESC) AS t
+    ${ew.customSqlSegment}
+    </select>
+
+    <select id="getSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
+        SELECT
+            sy_shipping_details.id AS syDeclarationElementsId,
+            sy_shipping_details_item.garment_Factory,
+            sy_shipping_details_item.order_Number
+        FROM sy_shipping_details
+        LEFT JOIN sy_shipping_details_item
+        ON sy_shipping_details.id=sy_shipping_details_item.shipping_details_id
+        where sy_shipping_details.id=#{value}
+        LIMIT 1
+    </select>
+
+    <update id="deleteByMainId"  parameterType="java.lang.String">
+        update sy_packing_list_fabric set del_flag='1' where id =#{value}
+    </update>
 
 </mapper>

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

@@ -1,5 +1,8 @@
 package org.jeecg.modules.splfi.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -19,22 +22,34 @@ public interface ISyPackingListFabricService extends IService<SyPackingListFabri
 	 * 添加一对多
 	 * 
 	 */
-	public void saveMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList) ;
+	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric, List<SyPackingListFabricItem> syPackingListFabricItemList) ;
 	
 	/**
 	 * 修改一对多
 	 * 
 	 */
-	public void updateMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList);
+	public SyPackingListFabric updateMain(SyPackingListFabric syPackingListFabric, List<SyPackingListFabricItem> syPackingListFabricItemList);
 	
 	/**
 	 * 删除一对多
 	 */
-	public void delMain (String id);
+	public void delMain(String id);
 	
 	/**
 	 * 批量删除一对多
 	 */
-	public void delBatchMain (Collection<? extends Serializable> idList);
-	
+	public void delBatchMain(Collection<? extends Serializable> idList);
+
+	/**
+	 * 查询发运明细数据
+	 */
+	public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, QueryWrapper<SyShippingDetailsVo> queryWrapper);
+
+
+	//根据id获取发运明细数据
+	public SyPackingListFabric getSyShippingDetailsData(String id);
+
+	//根据id获取主表子表汇总数据
+	public SyPackingListFabric selectById(String id);
+
 }

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

@@ -1,5 +1,8 @@
 package org.jeecg.modules.splfi.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
 import org.jeecg.modules.splfi.entity.SyPackingListFabric;
 import org.jeecg.modules.splfi.entity.SyPackingListFabricItem;
 import org.jeecg.modules.splfi.mapper.SyPackingListFabricItemMapper;
@@ -29,18 +32,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	
 	@Override
 	@Transactional
-	public void saveMain(SyPackingListFabric syPackingListFabric, List<SyPackingListFabricItem> syPackingListFabricItemList) {
+	public SyPackingListFabric saveMain(SyPackingListFabric syPackingListFabric, List<SyPackingListFabricItem> syPackingListFabricItemList) {
 		syPackingListFabricMapper.insert(syPackingListFabric);
 		for(SyPackingListFabricItem entity:syPackingListFabricItemList) {
-			//外键设置
+			//外键设置	
 			entity.setSyPackingListFabricId(syPackingListFabric.getId());
 			syPackingListFabricItemMapper.insert(entity);
 		}
+		return syPackingListFabric;
 	}
 
 	@Override
 	@Transactional
-	public void updateMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList) {
+	public SyPackingListFabric updateMain(SyPackingListFabric syPackingListFabric,List<SyPackingListFabricItem> syPackingListFabricItemList) {
 		syPackingListFabricMapper.updateById(syPackingListFabric);
 		
 		//1.先删除子表数据
@@ -52,13 +56,14 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setSyPackingListFabricId(syPackingListFabric.getId());
 			syPackingListFabricItemMapper.insert(entity);
 		}
+		return syPackingListFabric;
 	}
 
 	@Override
 	@Transactional
 	public void delMain(String id) {
 		syPackingListFabricItemMapper.deleteByMainId(id);
-		syPackingListFabricMapper.deleteById(id);
+		syPackingListFabricMapper.deleteByMainId(id);
 	}
 
 	@Override
@@ -66,8 +71,28 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	public void delBatchMain(Collection<? extends Serializable> idList) {
 		for(Serializable id:idList) {
 			syPackingListFabricItemMapper.deleteByMainId(id.toString());
-			syPackingListFabricMapper.deleteById(id);
+			syPackingListFabricMapper.deleteByMainId(id.toString());
 		}
 	}
-	
+
+	@Override
+	public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, QueryWrapper<SyShippingDetailsVo> queryWrapper) {
+		return syPackingListFabricMapper.queryShippingDetails(page,queryWrapper);//查询发运明细
+	}
+
+	@Override
+	public SyPackingListFabric getSyShippingDetailsData(String id) {
+		SyPackingListFabric syPackingListFabric=new SyPackingListFabric();
+		syPackingListFabric=syPackingListFabricMapper.getSyShippingDetailsData(id);
+		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.getSyShippingDetailsData(id));
+		return syPackingListFabric;
+	}
+
+	@Override
+	public SyPackingListFabric selectById(String id) {
+		SyPackingListFabric syPackingListFabric= syPackingListFabricMapper.selectById(id);
+		syPackingListFabric.setSyPackingListFabricItem(syPackingListFabricItemMapper.selectByMainId2(id));
+		return syPackingListFabric;
+	}
+
 }

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

@@ -23,69 +23,69 @@ import io.swagger.annotations.ApiModelProperty;
 public class SyPackingListFabricPage {
 	
 	/**id*/
-	private java.lang.String id;
+	private String id;
 	/**创建人*/
   	@Excel(name = "创建人", width = 15)
-	private java.lang.String createBy;
+	private 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;
+	private Date createTime;
 	/**修改人*/
   	@Excel(name = "修改人", width = 15)
-	private java.lang.String updateBy;
+	private 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;
+	private Date updateTime;
 	/**组织*/
   	@Excel(name = "组织", width = 15)
-	private java.lang.String pkOrg;
+	private String pkOrg;
 	/**删除状态*/
   	@Excel(name = "删除状态", width = 15)
-	private java.lang.String delFlag;
+	private String delFlag;
 	/**备注*/
   	@Excel(name = "备注", width = 15)
-	private java.lang.Object memo;
+	private Object memo;
 	/**订单号*/
   	@Excel(name = "订单号", width = 15)
-	private java.lang.String orderNumber;
+	private String orderNumber;
 	/**集装箱号*/
   	@Excel(name = "集装箱号", width = 15)
-	private java.lang.String containerNumber;
+	private 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;
+	private Date loadingDate;
 	/**成衣工厂*/
   	@Excel(name = "成衣工厂", width = 15)
-	private java.lang.String theGarmentFactory;
+	private String theGarmentFactory;
 	/**发票号*/
   	@Excel(name = "发票号", width = 15)
-	private java.lang.String invoiceNo;
+	private String invoiceNo;
 	/**制单人*/
   	@Excel(name = "制单人", width = 15)
-	private java.lang.String preparedBy;
+	private 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;
+	private Date preparedDate;
 	/**外销发票号*/
   	@Excel(name = "外销发票号", width = 15)
-	private java.lang.String exportInvoiceNo;
+	private String exportInvoiceNo;
 	/**托书号*/
   	@Excel(name = "托书号", width = 15)
-	private java.lang.String joeBookNumber;
+	private String joeBookNumber;
 	/**预托书号*/
   	@Excel(name = "预托书号", width = 15)
-	private java.lang.String underpinningOfBookNumber;
+	private String underpinningOfBookNumber;
 	/**备注*/
   	@Excel(name = "备注", width = 15)
-	private java.lang.Object remarks;
+	private Object remarks;
 	
 	@ExcelCollection(name="面料装箱单")
 	@ApiModelProperty(value = "面料装箱单")