预装箱单

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

@@ -64,7 +64,7 @@
         left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
 		left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID--绑定委外订单子表
         left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105' and  OM_MatSettleVouchs.cRdBusType='委外发料'
+        where Vendor.cVCCode='0105'
 		AND cVenName=#{value}
 		GROUP BY Inventory.cInvName,OM_MODetails.cfree1)p
     </select>
@@ -86,7 +86,7 @@
             left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
             left join OM_MatSettleVouch on  OM_MODetails.MODetailsID=OM_MatSettleVouch.MODetailsID
             left join OM_MatSettleVouchs on OM_MatSettleVouchs.msid=OM_MatSettleVouch.msid
-        where Vendor.cVCCode='0105' and  OM_MatSettleVouchs.cRdBusType='委外发料'
+        where Vendor.cVCCode='0105'
         GROUP BY cVenName) p
     </select>
 

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

@@ -3,15 +3,22 @@ package org.jeecg.modules.spapl.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 java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.vo.LoginUser;
 import org.apache.shiro.SecurityUtils;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.shippingDetails.service.ISyShippingDetailsItemService;
+import org.jeecg.modules.documents.shippingDetails.service.ISyShippingDetailsService;
+import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -56,6 +63,10 @@ public class SyPreAssembledPackingListController {
 	private ISyPreAssembledPackingListService syPreAssembledPackingListService;
 	@Autowired
 	private ISyPreAssembledPackingListItemService syPreAssembledPackingListItemService;
+	@Autowired
+	private ISyShippingDetailsService syShippingDetailsService;
+	@Autowired
+	private ISyShippingDetailsItemService syShippingDetailsItemService;
 	
 	/**
 	 * 分页列表查询
@@ -66,51 +77,228 @@ public class SyPreAssembledPackingListController {
 	 * @param req
 	 * @return
 	 */
-	@AutoLog(value = "预装箱单主表-分页列表查询")
+	/*@AutoLog(value = "预装箱单主表-分页列表查询")
 	@ApiOperation(value="预装箱单主表-分页列表查询", notes="预装箱单主表-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<?> queryPageList(SyPreAssembledPackingList syPreAssembledPackingList,
+	public Result<IPage<SyPreAssembledPackingList>> queryPageList(SyPreAssembledPackingList syPreAssembledPackingList,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		QueryWrapper<SyPreAssembledPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingList, req.getParameterMap());
+		QueryWrapper<SyPreAssembledPackingList> queryWrapper = new QueryWrapper<>();
+
+		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getOrderNumber())){
+			queryWrapper.eq("a.order_number",syPreAssembledPackingList.getOrderNumber());//订单号
+		}
+		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getItemNumber())){
+			queryWrapper.eq("a.item_number",syPreAssembledPackingList.getItemNumber());//款号
+		}
+		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getProductName())){
+			queryWrapper.eq("a.product_Name",syPreAssembledPackingList.getProductName());//品名
+		}
+		queryWrapper.eq("a.del_flag","0");//默认查询未删除
 		Page<SyPreAssembledPackingList> page = new Page<SyPreAssembledPackingList>(pageNo, pageSize);
 		IPage<SyPreAssembledPackingList> pageList = syPreAssembledPackingListService.page(page, queryWrapper);
 		return Result.OK(pageList);
-	}
-	
+	}*/
+
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param syPreAssembledPackingListVo
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "预装箱单VO查询")
+	 @ApiOperation(value="预装箱单VO查询", notes="预装箱单VO查询")
+	 @GetMapping(value = "/list")
+	 public Result<IPage<SyPreAssembledPackingListVo>> queryPageList2(SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+									 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									 HttpServletRequest req) {
+		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper = QueryGenerator.initQueryWrapper(syPreAssembledPackingListVo, req.getParameterMap());
+		 queryWrapper.eq("a.del_flag","0");//默认查询未删除
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
+			 queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
+		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){
+			 queryWrapper.eq("a.item_number",syPreAssembledPackingListVo.getItemNumber());//款号
+		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){
+			 queryWrapper.eq("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
+		 }
+		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);
+		 IPage<SyPreAssembledPackingListVo> pageList = syPreAssembledPackingListService.selectPage(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+	 @AutoLog(value = "参照发运明细")
+	 @ApiOperation(value="参照发运明细", notes="参照发运明细")
+	 @GetMapping(value = "/list3")
+	 public Result<IPage<SyShippingDetailsVo>> queryPageList3(
+	 								 @RequestParam(name="documentNo",required = false) String documentNo,
+									 @RequestParam(name="customer",required = false) String customer,
+									 @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(customer)){
+			 queryWrapper.eq("t.customer",customer);//客户
+		 }
+		 /*if(customer!=null && !customer.trim().equals("")){
+			 queryWrapper.eq("t.customer",customer);//客户
+		 }*/
+		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(pageNo, pageSize);
+		 IPage<SyShippingDetailsVo> pageList = syPreAssembledPackingListService.queryShippingDetails(page, queryWrapper);
+		 result.setSuccess(true);
+		 result.setResult(pageList);
+		 result.setMessage("查询成功");
+		 return result;
+	 }
+
+	 @AutoLog(value = "参照发运明细-通过主表id查询")
+	 @ApiOperation(value="参照发运明细-通过主表id查询", notes="参照发运明细-通过主表id查询")
+	 @GetMapping(value = "/queryShippingDetails")
+	 public Result<SyPreAssembledPackingList> queryPageList4(@RequestParam(name="id") String id) {
+		 //通过输入id来获取发运明细的数据
+		 Result<SyPreAssembledPackingList> result = new Result<>();
+		 if(oConvertUtils.isEmpty(id)){
+		 	result.setSuccess(false);
+		 	result.setMessage("未找到id");
+		 }
+		 SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListService.queryPageList3(id);//获取数据
+		 result.setSuccess(true);
+		 result.setResult(syPreAssembledPackingList);
+		 result.setMessage("查询成功！");
+		 return result;
+	 }
+
 	/**
 	 * 添加
 	 *
-	 * @param syPreAssembledPackingListPage
+	 * @param syPreAssembledPackingList
 	 * @return
 	 */
 	@AutoLog(value = "预装箱单主表-添加")
 	@ApiOperation(value="预装箱单主表-添加", notes="预装箱单主表-添加")
 	@PostMapping(value = "/add")
-	public Result<?> add(@RequestBody SyPreAssembledPackingListPage syPreAssembledPackingListPage) {
-		SyPreAssembledPackingList syPreAssembledPackingList = new SyPreAssembledPackingList();
-		BeanUtils.copyProperties(syPreAssembledPackingListPage, syPreAssembledPackingList);
-		syPreAssembledPackingListService.saveMain(syPreAssembledPackingList, syPreAssembledPackingListPage.getSyPreAssembledPackingListItemList());
-		return Result.OK("添加成功!");
+	public Result<SyPreAssembledPackingList> add(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
+		Result<SyPreAssembledPackingList> result=new Result<>();
+		try{
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList)){
+				result.setMessage("请先填好信息再提交");
+				result.setSuccess(false);
+				return result;
+			}
+			syPreAssembledPackingList=syPreAssembledPackingListService.saveMain(syPreAssembledPackingList);
+			result.setSuccess(true);
+			result.setMessage("添加成功");
+			result.setResult(syPreAssembledPackingList);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("添加失败：" + ex.getMessage());
+			result.error500("添加失败:" + ex.getMessage());
+		}
+		return result;
 	}
 	
 	/**
 	 * 编辑
 	 *
-	 * @param syPreAssembledPackingListPage
+	 * @param syPreAssembledPackingList
 	 * @return
 	 */
 	@AutoLog(value = "预装箱单主表-编辑")
 	@ApiOperation(value="预装箱单主表-编辑", notes="预装箱单主表-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<?> edit(@RequestBody SyPreAssembledPackingListPage syPreAssembledPackingListPage) {
-		SyPreAssembledPackingList syPreAssembledPackingList = new SyPreAssembledPackingList();
-		BeanUtils.copyProperties(syPreAssembledPackingListPage, syPreAssembledPackingList);
-		syPreAssembledPackingListService.updateMain(syPreAssembledPackingList, syPreAssembledPackingListPage.getSyPreAssembledPackingListItemList());
-		return Result.OK("编辑成功!");
+	public Result<SyPreAssembledPackingList> edit(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
+		Result<SyPreAssembledPackingList> result=new Result<>();
+		try{
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList.getId())){
+				result.setMessage("未找到id");
+				result.setSuccess(false);
+				return result;
+			}
+			SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListService.getById(syPreAssembledPackingList.getId());
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList2)){
+				result.setMessage("未找到对应数据");
+				result.setSuccess(false);
+				return result;
+			}
+			if(syPreAssembledPackingList2.getPushStatus().equals("1")){
+				result.setMessage("该单据已推送,不能修改!");
+				result.setSuccess(false);
+				return result;
+			}
+			syPreAssembledPackingListService.updateMain(syPreAssembledPackingList);
+			result.setSuccess(true);
+			result.setMessage("修改成功");
+			result.setResult(syPreAssembledPackingList);
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("修改失败：" + ex.getMessage());
+			result.error500("修改失败:" + ex.getMessage());
+		}
+		return result;
 	}
-	
+
+	 /**
+	  * 推送
+	  *
+	  * @param syPreAssembledPackingList
+	  * @return
+	  */
+	 @AutoLog(value = "预装箱单主表-推送(未完成)")
+	 @ApiOperation(value="预装箱单主表-推送(未完成)", notes="预装箱单主表-推送(未完成)")
+	 @RequestMapping(value = "/push", method = {RequestMethod.GET})
+	 public Result<?> push(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
+	 	return Result.OK("该功能暂未完成!!");
+	 }
+
+	 /**
+	  * 提交
+	  *
+	  * @param syPreAssembledPackingList
+	  * @return
+	  */
+	 @AutoLog(value = "预装箱单主表-提交")
+	 @ApiOperation(value="预装箱单主表-提交", notes="预装箱单主表-提交")
+	 @RequestMapping(value = "/submit", method = {RequestMethod.GET})
+	 public Result<SyPreAssembledPackingList> submit(@RequestBody SyPreAssembledPackingList syPreAssembledPackingList) {
+	 	Result<SyPreAssembledPackingList> result=new Result<>();
+	 	try{
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList.getId())){
+				result.setMessage("未获取到id!");
+				result.setSuccess(false);
+				return result;
+			}
+			SyPreAssembledPackingList syPreAssembledPackingList2=syPreAssembledPackingListService.getById(syPreAssembledPackingList.getId());
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList2)){
+				result.setMessage("未找到该数据!");
+				result.setSuccess(false);
+				return result;
+			}
+			syPreAssembledPackingList2.setStatus("1");//修改为提交状态
+			boolean bool= syPreAssembledPackingListService.updateById(syPreAssembledPackingList2);//修改提交状态
+			if(bool==true){
+				result.setMessage("提交成功!");
+				result.setSuccess(true);
+				result.setResult(syPreAssembledPackingList2);
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("提交失败：" + ex.getMessage());
+			result.error500("提交失败:" + ex.getMessage());
+		}
+	 	return result;
+	 }
+
 	/**
 	 * 通过id删除
 	 *
@@ -120,9 +308,37 @@ public class SyPreAssembledPackingListController {
 	@AutoLog(value = "预装箱单主表-通过id删除")
 	@ApiOperation(value="预装箱单主表-通过id删除", notes="预装箱单主表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-	    syPreAssembledPackingListService.delMain(id);
-		return Result.OK("删除成功!");
+	public Result<Integer> delete(@RequestParam(name="id",required=true) String id) {
+		Result<Integer> result=new Result<>();
+		try{
+			if(oConvertUtils.isEmpty(id)){//判断id是否为空
+				result.setMessage("未获取到id！");
+				result.setSuccess(false);
+				return result;
+			}
+			SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListService.getById(id);
+			if(oConvertUtils.isEmpty(syPreAssembledPackingList)){//查询id在数据库里有没有值
+				result.setMessage("未找到该数据！");
+				result.setSuccess(false);
+				return result;
+			}
+			if(syPreAssembledPackingList.getStatus().equals("1")){
+				result.setMessage("该单据已提交,不能删除！");
+				result.setSuccess(false);
+				return result;
+			}
+			int row=syPreAssembledPackingListService.delMain(id);
+			if(row>0){
+				result.setResult(row);
+				result.setMessage("删除成功！");
+				result.setSuccess(true);
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("删除失败：" + ex.getMessage());
+			result.error500("删除失败:" + ex.getMessage());
+		}
+		return result;
 	}
 	
 	/**
@@ -134,9 +350,40 @@ public class SyPreAssembledPackingListController {
 	@AutoLog(value = "预装箱单主表-批量删除")
 	@ApiOperation(value="预装箱单主表-批量删除", notes="预装箱单主表-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
-	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.syPreAssembledPackingListService.delBatchMain(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功！");
+	public Result<Integer> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<Integer> result=new Result<>();
+		List <String> strIds=Arrays.asList(ids.split(","));//将ids分成数组，再转换成集合
+		try{
+			if(oConvertUtils.isEmpty(ids)){//判断id是否为空
+				result.setMessage("未获取到id的信息！");
+				result.setSuccess(false);
+				return result;
+			}
+			for(String id : strIds){
+				SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListService.getById(id);
+				if(oConvertUtils.isEmpty(syPreAssembledPackingList)){//查询id在数据库里有没有值
+					result.setMessage("未找到该数据！");
+					result.setSuccess(false);
+					return result;
+				}
+				if(syPreAssembledPackingList.getStatus().equals("1")){
+					result.setMessage("已提交过的单据,不能删除！");
+					result.setSuccess(false);
+					return result;
+				}
+			}
+			int row=this.syPreAssembledPackingListService.delBatchMain(strIds);
+			if(row>0){
+				result.setResult(row);
+				result.setSuccess(true);
+				result.setMessage("批量删除成功!");
+			}
+		}catch (Exception ex){
+			ex.printStackTrace();
+			log.error("批量删除失败：" + ex.getMessage());
+			result.error500("批量删除失败:" + ex.getMessage());
+		}
+		return result;
 	}
 	
 	/**
@@ -148,9 +395,23 @@ public class SyPreAssembledPackingListController {
 	@AutoLog(value = "预装箱单主表-通过id查询")
 	@ApiOperation(value="预装箱单主表-通过id查询", notes="预装箱单主表-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
-		SyPreAssembledPackingList syPreAssembledPackingList = syPreAssembledPackingListService.getById(id);
-		return Result.OK(syPreAssembledPackingList);
+	public Result<SyPreAssembledPackingList> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<SyPreAssembledPackingList> result=new Result<>();
+		if(oConvertUtils.isEmpty(id)){
+			result.setSuccess(false);
+			result.setMessage("未获取到id的信息");
+		}
+		QueryWrapper<SyPreAssembledPackingList> queryWrapper = new QueryWrapper<SyPreAssembledPackingList>();
+		queryWrapper.eq("id",id).eq("del_flag",0);//预装箱单主表id
+		SyPreAssembledPackingList preAssembledPackingList=syPreAssembledPackingListService.queryById(queryWrapper);//已筛选删除状态
+		List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainId(id);//已筛选删除状态
+		if(spaplItems.size()>0){
+			preAssembledPackingList.setSyPreAssembledPackingListItemList(spaplItems);
+		}
+		result.setMessage("查询成功！");
+		result.setSuccess(false);
+		result.setResult(preAssembledPackingList);
+		return result;
 	}
 	
 	/**
@@ -163,13 +424,23 @@ public class SyPreAssembledPackingListController {
 	@ApiOperation(value="预装箱单子表-通过主表ID查询", notes="预装箱单主表-通过主表ID查询")
 	@GetMapping(value = "/querySyPreAssembledPackingListItemByMainId")
 	public Result<?> querySyPreAssembledPackingListItemListByMainId(@RequestParam(name="id",required=true) String id) {
-		List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList = syPreAssembledPackingListItemService.selectByMainId(id);
-		return Result.OK(syPreAssembledPackingListItemList);
+		Result<List<SyPreAssembledPackingListItem>> result=new Result<>();
+		if(oConvertUtils.isEmpty(id)){
+			result.setSuccess(false);
+			result.setMessage("未获取到id的信息");
+		}
+		List<SyPreAssembledPackingListItem> spaplItems = syPreAssembledPackingListItemService.selectByMainId(id);
+		if(spaplItems.size()>0){
+			result.setResult(spaplItems);
+			result.setSuccess(true);
+			result.setMessage("查询成功！");
+		}
+		return result;
 	}
 
   /**
    * 导出excel
-   *
+   * 不传数据就是导出全部，传id就根据id查询导出
    * @param request
    * @param syPreAssembledPackingList
    */
@@ -193,7 +464,7 @@ public class SyPreAssembledPackingListController {
       ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
       mv.addObject(NormalExcelConstants.FILE_NAME, "预装箱单主表");
       mv.addObject(NormalExcelConstants.CLASS, SyPreAssembledPackingListPage.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("预装箱单主表数据", "导出人:hxy", "预装箱单主表"));
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("预装箱单主表数据", "导出人:admin", "预装箱单主表"));
       mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
       return mv;
   }
@@ -220,7 +491,8 @@ public class SyPreAssembledPackingListController {
               for (SyPreAssembledPackingListPage page : list) {
                   SyPreAssembledPackingList po = new SyPreAssembledPackingList();
                   BeanUtils.copyProperties(page, po);
-                  syPreAssembledPackingListService.saveMain(po, page.getSyPreAssembledPackingListItemList());
+                  po.setSyPreAssembledPackingListItemList(page.getSyPreAssembledPackingListItemList());
+                  syPreAssembledPackingListService.saveMain(po);
               }
               return Result.OK("文件导入成功！数据行数:" + list.size());
           } catch (Exception e) {
@@ -237,4 +509,6 @@ public class SyPreAssembledPackingListController {
       return Result.OK("文件导入失败！");
   }
 
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -2,11 +2,15 @@ package org.jeecg.modules.spapl.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;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -108,4 +112,37 @@ public class SyPreAssembledPackingList implements Serializable {
 	/**备注*/
 	@ApiModelProperty(value = "备注")
 	private Object memo;
+	/**预发货日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@ApiModelProperty(value = "预发货日期")
+	private Date preDeliveryDate;
+/*	*//**小PO*//*
+	@ApiModelProperty(value = "小PO")
+	private String smallPo;
+	*//**分销点*//*
+	@ApiModelProperty(value = "分销点")
+	private String distributionPoint;
+	*//**存货名称*//*
+	@ApiModelProperty(value = "存货名称")
+	private String inventoryName;
+	*//**颜色*//*
+	@ApiModelProperty(value = "颜色")
+	private String colour;
+	*//**采购/委外订单号*//*
+	@ApiModelProperty(value = "采购/委外订单号")
+	private String purOrSubOrder;*/
+	/**订单类型*/
+	@ApiModelProperty(value = "订单类型")
+	private String orderType;
+	/**工厂单价*/
+	/*@ApiModelProperty(value = "工厂单价")
+	private java.math.BigDecimal factoryUnitPrice;
+	*//**数量（按合并规则累计）*//*
+	@ApiModelProperty(value = "数量（按合并规则累计）")
+	private java.math.BigDecimal totalQuantity;*/
+	//子表集合
+	@TableField(exist = false)
+	@ApiModelProperty(value = "子表集合")
+	private List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -29,6 +29,10 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "装箱单id")
 	private String id;
 	/**发运明细主表id*/
+	@Excel(name = "预装箱单主表id", width = 15)
+	@ApiModelProperty(value = "预装箱单主表id")
+	private String syPreAssembledPackingListId;
+	/**发运明细主表id*/
     @Excel(name = "发运明细主表id", width = 15)
 	@ApiModelProperty(value = "发运明细主表id")
 	private String syDeclarationElementsId;
@@ -176,9 +180,53 @@ public class SyPreAssembledPackingListItem implements Serializable {
     @Excel(name = "备注", width = 15)
 	@ApiModelProperty(value = "备注")
 	private Object memo;
+	/**备注*/
+	@Excel(name = "配码--根据U8订单来显示", width = 15)
+	@ApiModelProperty(value = "配码--根据U8订单来显示")
+	private String withCode;
+
+	/**小PO*/
+	@Excel(name = "小PO", width = 20)
+	@ApiModelProperty(value = "小PO")
+	private String smallPo;
+	/**存货名称*/
+	@Excel(name = "存货名称", width = 20)
+	@ApiModelProperty(value = "存货名称")
+	private String inventoryName;
+	/**采购/委外订单号*/
+	@Excel(name = "采购/委外订单号", width = 20)
+	@ApiModelProperty(value = "采购/委外订单号")
+	private String spurOrSubOrder;
+	/**工厂单价*/
+	@Excel(name = "工厂单价", width = 20)
+	@ApiModelProperty(value = "工厂单价")
+	private java.math.BigDecimal factoryUnitPrice;
+	/**数量（按合并规则累计）*/
+	@Excel(name = "数量（按合并规则累计）", width = 20)
+	@ApiModelProperty(value = "数量（按合并规则累计）")
+	private java.math.BigDecimal totalQuantity;
+	/**客户简称*/
+	@Excel(name = "客户简称", width = 20)
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+
+
+
 
 
-	public void setSyPackingListTailoringId(String id) {
-		this.syDeclarationElementsId=id;
-	}
+	/**客户简称*//*
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	*//**客户简称*//*
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	*//**客户简称*//*
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	*//**客户简称*//*
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	*//**客户简称*//*
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;*/
 }

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

@@ -15,4 +15,6 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 	public boolean deleteByMainId(String mainId);
     
 	public List<SyPreAssembledPackingListItem> selectByMainId(String mainId);
+
+	public List<SyPreAssembledPackingListItem> selectSyShippingDetailsItemData(String id);
 }

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

@@ -2,9 +2,12 @@ package org.jeecg.modules.spapl.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.spapl.entity.SyPreAssembledPackingList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
 
 /**
  * @Description: 预装箱单主表
@@ -14,4 +17,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface SyPreAssembledPackingListMapper extends BaseMapper<SyPreAssembledPackingList> {
 
+   SyPreAssembledPackingList  selectSyShippingDetailsData(String id);
+
+   Integer deleteId(String id);
+
+   IPage<SyPreAssembledPackingListVo> selectPage(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
 }

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

@@ -2,17 +2,37 @@
 <!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.SyPreAssembledPackingListItemMapper">
 
-	<delete id="deleteByMainId" parameterType="java.lang.String">
-		DELETE 
-		FROM  sy_pre_assembled_packing_list_item 
-		WHERE
-			 sy_declaration_elements_id = #{id}
-	</delete>
+	<update id="deleteByMainId" parameterType="java.lang.String">
+		update sy_pre_assembled_packing_list_item set
+			del_flag='1'
+		where sy_pre_assembled_packing_list_id = #{id}
+	</update>
+
 	
 	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
 		SELECT * 
 		FROM  sy_pre_assembled_packing_list_item
 		WHERE
-			 sy_declaration_elements_id = #{id}
+			 sy_pre_assembled_packing_list_id = #{id} and del_flag = 0
+	</select>
+
+	<select id="selectSyShippingDetailsItemData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">
+		 select
+		 	shipping_details_id syDeclarationElementsId,/*发育明细主表id s*/
+		 	sy_shipping_details_item.id syDeclarationElementsItemId,/*发育明细子表id s*/
+		 	account acSetNo,/*单据号 s*/
+			sy_shipping_details_item.distribution_point distributionPoint,/*分销点 s*/
+			factory_unit_price factoryUnitPrice,/*工厂单价 s*/
+			size,/*尺码 s*/
+			colour,/*颜色 s*/
+		    sy_shipping_details_item.item_Number itemNumber, /*款号 s*/
+          	sy_shipping_details_item.customer_Abbreviation customerAbbreviation, /*客户简称 s*/
+          	sy_shipping_details_item.small_Po smallPo, /*小PO s*/
+           	sy_shipping_details_item.distribution_Point distributionPoint, /*分销点 s*/
+            sy_shipping_details_item.inventory_Name inventoryName, /*存货名称 s*/
+            sy_shipping_details_item.pur_Or_Sub_Order  purOrSubOrder /*采购/委外订单号 s*/
+		 from sy_shipping_details_item left join sy_order_data_item
+		 on sy_shipping_details_item.sy_order_data_item_id=sy_order_data_item.id
+		 where sy_shipping_details_item.del_flag = 0 and shipping_details_id=#{value}
 	</select>
 </mapper>

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

@@ -1,5 +1,35 @@
 <?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.spapl.mapper.SyPreAssembledPackingListMapper">
+    <select id="selectSyShippingDetailsData" parameterType="java.lang.String" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList">
+        /*获取发运明细数据*/
+        select
+            id syDeclarationElementsId, /*发运明细主表id*/
+            pre_delivery_date preDeliveryDate, /*预发货日期 m*/
+            order_Type  orderType /*订单类型 m*/
+        from sy_shipping_details
+        where del_flag = 0 and id=#{value}
+	</select>
 
+    <select id="selectPage" resultType="org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo">
+        /*获取汇总数据*/
+       select a.*,
+			b.customer_abbreviation,
+			sum(b.total_quantity) totalquantity,
+			b.factory_unit_price,
+			b.pur_or_sub_order,
+			b.inventory_name,
+			b.small_po,
+			b.distribution_point
+        from Sy_Pre_Assembled_Packing_List  a
+        left join Sy_Pre_Assembled_Packing_List_item  b
+        on a.id=b.sy_pre_assembled_packing_list_id  AND b.del_flag='0'
+        ${ew.customSqlSegment}
+        group by a.id
+	</select>
+
+    <update id="deleteId" parameterType="java.lang.String">
+        update sy_pre_assembled_packing_list set del_flag='1' where
+        id=#{value}
+    </update>
 </mapper>

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

@@ -13,4 +13,5 @@ import java.util.List;
 public interface ISyPreAssembledPackingListItemService extends IService<SyPreAssembledPackingListItem> {
 
 	public List<SyPreAssembledPackingListItem> selectByMainId(String mainId);
+
 }

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

@@ -1,8 +1,14 @@
 package org.jeecg.modules.spapl.service;
 
+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.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
+
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
@@ -19,22 +25,50 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 	 * 添加一对多
 	 * 
 	 */
-	public void saveMain(SyPreAssembledPackingList syPreAssembledPackingList, List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList) ;
-	
+	public SyPreAssembledPackingList saveMain(SyPreAssembledPackingList syPreAssembledPackingList) ;
+
 	/**
 	 * 修改一对多
 	 * 
 	 */
-	public void updateMain(SyPreAssembledPackingList syPreAssembledPackingList, List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList);
+	public SyPreAssembledPackingList updateMain(SyPreAssembledPackingList syPreAssembledPackingList);
 	
 	/**
 	 * 删除一对多
 	 */
-	public void delMain(String id);
+	public Integer delMain(String id);
 	
 	/**
 	 * 批量删除一对多
 	 */
-	public void delBatchMain(Collection<? extends Serializable> idList);
-	
+	public Integer delBatchMain(Collection<? extends Serializable> idList);
+
+
+	/**
+	 * 查询发运明细数据
+	 */
+	public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, QueryWrapper<SyShippingDetailsVo> queryWrapper);
+
+	/**
+	 * 根据id查询发运明细
+	 * @param id
+	 * @return
+	 */
+	public SyPreAssembledPackingList queryPageList3(String id);
+
+	/**
+	 * 汇总预装箱单
+	 * @param page,queryWrapper
+	 * @return
+	 */
+	public IPage<SyPreAssembledPackingListVo> selectPage(IPage<SyPreAssembledPackingListVo> page,QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
+
+
+	/**
+	 * 根据id查询不为删除状态的数据
+	 * @param queryWrapper
+	 * @return
+	 */
+	public SyPreAssembledPackingList queryById(QueryWrapper<SyPreAssembledPackingList> queryWrapper);
+
 }

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

@@ -1,15 +1,29 @@
 package org.jeecg.modules.spapl.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModelProperty;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.modules.documents.shippingDetails.controller.SyShippingDetailsController;
+import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo;
+import org.jeecg.modules.documents.shippingDetails.mapper.SyShippingDetailsMapper;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListItemMapper;
 import org.jeecg.modules.spapl.mapper.SyPreAssembledPackingListMapper;
 import org.jeecg.modules.spapl.service.ISyPreAssembledPackingListService;
+import org.jeecg.modules.spapl.vo.SyPreAssembledPackingListVo;
 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 javax.annotation.Resource;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Collection;
 
@@ -26,48 +40,124 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	private SyPreAssembledPackingListMapper syPreAssembledPackingListMapper;
 	@Autowired
 	private SyPreAssembledPackingListItemMapper syPreAssembledPackingListItemMapper;
+	@Autowired
+	private SyShippingDetailsMapper syShippingDetailsMapper;
 	
 	@Override
 	@Transactional
-	public void saveMain(SyPreAssembledPackingList syPreAssembledPackingList, List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList) {
-		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);
-		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingListItemList) {
-			//外键设置
-			entity.setSyDeclarationElementsId(syPreAssembledPackingList.getId());
-			syPreAssembledPackingListItemMapper.insert(entity);
+	public SyPreAssembledPackingList saveMain(SyPreAssembledPackingList syPreAssembledPackingList) {
+		syPreAssembledPackingList.setDelFlag("0");//删除状态默认为0
+		syPreAssembledPackingList.setPushStatus("0");//推送状态默认为0
+		syPreAssembledPackingList.setStatus("0");//单据装填默认为0
+
+		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
+		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
+		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
+		BigDecimal totalVolume=new BigDecimal(0);//总体积
+		BigDecimal totalPrice=new BigDecimal(0);//总价
+		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//添加主表数据
+
+		/*BigDecimal total;//总件数*/
+		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingList.getSyPreAssembledPackingListItemList()) {
+			totalBoxes=totalBoxes.add(entity.getBoxNumber());//箱数
+			totalNetWeight=totalNetWeight.add(entity.getTotalNetWeight());//总净重
+			totalGrossWeight=totalGrossWeight.add(entity.getTotalGrossWeight());//总毛重
+			totalVolume=totalVolume.add(entity.getTotalVolume());//总体积
+			totalPrice=totalPrice.add(entity.getTotalPrice());//总价
+			entity.setDelFlag("0");//默认为0
+			entity.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());
+			syPreAssembledPackingListItemMapper.insert(entity);//循环添加子表数据
 		}
+		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
+		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
+		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
+		syPreAssembledPackingList.setTotalVolume(totalVolume);
+		syPreAssembledPackingList.setTotalPrice(totalPrice);
+		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
+		return syPreAssembledPackingList;
 	}
 
 	@Override
 	@Transactional
-	public void updateMain(SyPreAssembledPackingList syPreAssembledPackingList,List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList) {
-		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
-		
+	public SyPreAssembledPackingList updateMain(SyPreAssembledPackingList syPreAssembledPackingList) {
+		//syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
+
+		if(!syPreAssembledPackingListMapper.selectById(syPreAssembledPackingList.getId()).getStatus().equals("0")){
+			throw new JeecgBootException("单据已提交不能修改！");
+		}
 		//1.先删除子表数据
-		syPreAssembledPackingListItemMapper.deleteByMainId(syPreAssembledPackingList.getId());
-		
+		syPreAssembledPackingListItemMapper.deleteByMainId(syPreAssembledPackingList.getId());//将删除状态变成1
+		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
+		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
+		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
+		BigDecimal totalVolume=new BigDecimal(0);//总体积
+		BigDecimal totalPrice=new BigDecimal(0);//总价
 		//2.子表数据重新插入
-		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingListItemList) {
+		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingList.getSyPreAssembledPackingListItemList()) {
 			//外键设置
-			entity.setSyDeclarationElementsId(syPreAssembledPackingList.getId());
-			syPreAssembledPackingListItemMapper.insert(entity);
+			//entity.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());
+			totalBoxes=totalBoxes.add(entity.getBoxNumber());//箱数
+			totalNetWeight=totalNetWeight.add(entity.getTotalNetWeight());//总净重
+			totalGrossWeight=totalGrossWeight.add(entity.getTotalGrossWeight());//总毛重
+			totalVolume=totalVolume.add(entity.getTotalVolume());//总体积
+			totalPrice=totalPrice.add(entity.getTotalPrice());//总价
+			entity.setDelFlag("0");//默认为0
+			int row=syPreAssembledPackingListItemMapper.updateById(entity);
+			if(row==0){//如果为0就添加数据
+				syPreAssembledPackingListItemMapper.insert(entity);
+			}
 		}
+		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
+		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
+		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
+		syPreAssembledPackingList.setTotalVolume(totalVolume);
+		syPreAssembledPackingList.setTotalPrice(totalPrice);
+		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
+		return syPreAssembledPackingList;
 	}
 
 	@Override
 	@Transactional
-	public void delMain(String id) {
-		syPreAssembledPackingListItemMapper.deleteByMainId(id);
-		syPreAssembledPackingListMapper.deleteById(id);
+	public Integer delMain(String id) {
+		syPreAssembledPackingListItemMapper.deleteByMainId(id);//将删除状态更改为1
+		return syPreAssembledPackingListMapper.deleteId(id);//将删除状态更改为1
 	}
 
 	@Override
 	@Transactional
-	public void delBatchMain(Collection<? extends Serializable> idList) {
-		for(Serializable id:idList) {
-			syPreAssembledPackingListItemMapper.deleteByMainId(id.toString());
-			syPreAssembledPackingListMapper.deleteById(id);
+	public Integer delBatchMain(Collection<? extends Serializable> idList) {
+		int row=0;
+		for(Serializable id:idList) {//批处理删除主表数据
+			syPreAssembledPackingListItemMapper.deleteByMainId(id.toString());//将删除状态更改为1
+			//syPreAssembledPackingListMapper.deleteById(id);
+			row=syPreAssembledPackingListMapper.deleteId(id.toString());//将删除状态更改为1
 		}
+		return row;
 	}
-	
+
+
+	@Override
+	public IPage<SyShippingDetailsVo> queryShippingDetails(IPage<SyShippingDetailsVo> page, QueryWrapper<SyShippingDetailsVo> queryWrapper) {
+		return syShippingDetailsMapper.queryShippingDetails(page,queryWrapper);//查询发运明细
+	}
+
+	@Override
+	public SyPreAssembledPackingList queryPageList3(String id) {
+		SyPreAssembledPackingList syPreAssembledPackingList=syPreAssembledPackingListMapper.selectSyShippingDetailsData(id);
+		List<SyPreAssembledPackingListItem> list=syPreAssembledPackingListItemMapper.selectSyShippingDetailsItemData(id);
+		if(list.size()>0)//如果list有数据就添加
+		syPreAssembledPackingList.setSyPreAssembledPackingListItemList(list);
+		return syPreAssembledPackingList;
+	}
+
+	@Override
+	public IPage<SyPreAssembledPackingListVo> selectPage(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper) {
+		return syPreAssembledPackingListMapper.selectPage(page,queryWrapper);
+	}
+
+	@Override
+	public SyPreAssembledPackingList queryById(QueryWrapper<SyPreAssembledPackingList> queryWrapper) {
+		return syPreAssembledPackingListMapper.selectOne(queryWrapper);
+	}
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListPage.java

@@ -103,9 +103,38 @@ public class SyPreAssembledPackingListPage {
 	/**备注*/
   	@Excel(name = "备注", width = 15)
 	private Object memo;
-	
+
+	/**预发货日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "预发货日期", width = 20)
+	private Date preDeliveryDate;
+/*	*//**小PO*//*
+	@Excel(name = "小PO", width = 20)
+	private String smallPo;
+	*//**分销点*//*
+	@Excel(name = "分销点", width = 20)
+	private String distributionPoint;
+	*//**存货名称*//*
+	@Excel(name = "存货名称", width = 20)
+	private String inventoryName;
+	*//**颜色*//*
+	@Excel(name = "颜色", width = 20)
+	private String colour;
+	*//**采购/委外订单号*//*
+	@Excel(name = "采购/委外订单号", width = 20)
+	private String spurOrSubOrder;*/
+	/**订单类型*/
+	@Excel(name = "订单类型", width = 20)
+	private String orderType;
+/*	*//**工厂单价*//*
+	@Excel(name = "工厂单价", width = 20)
+	private java.math.BigDecimal factoryUnitPrice;
+	*//**数量（按合并规则累计）*//*
+	@Excel(name = "数量（按合并规则累计）", width = 20)
+	private java.math.BigDecimal totalQuantity;
+	*/
 	@ExcelCollection(name="预装箱单子表")
-	@ApiModelProperty(value = "预装箱单子表")
 	private List<SyPreAssembledPackingListItem> syPreAssembledPackingListItemList;
 	
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -0,0 +1,172 @@
+package org.jeecg.modules.spapl.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description: 预装箱单主表
+ * @Author: jeecg-boot
+ * @Date:   2022-04-20
+ * @Version: V1.0
+ */
+@Data
+@ApiModel(value="sy_pre_assembled_packing_listPage对象", description="预装箱单主表")
+public class SyPreAssembledPackingListVo {
+	
+	/**主键id*/
+	private String id;
+	/**发运明细主表id*/
+	@ApiModelProperty(value = "发运明细主表id")
+  	@Excel(name = "发运明细主表id", width = 15)
+	private String syDeclarationElementsId;
+	/**订单号*/
+	@ApiModelProperty(value = "订单号")
+  	@Excel(name = "订单号", width = 15)
+	private String orderNumber;
+	/**款号*/
+	@ApiModelProperty(value = "款号")
+  	@Excel(name = "款号", width = 15)
+	private String itemNumber;
+	/**品名*/
+	@ApiModelProperty(value = "品名")
+  	@Excel(name = "品名", width = 15)
+	private String productName;
+	/**尺码范围*/
+	@ApiModelProperty(value = "尺码范围")
+  	@Excel(name = "尺码范围", width = 15)
+	private String sizeRange;
+	/**客户*/
+	@ApiModelProperty(value = "客户")
+  	@Excel(name = "客户", width = 15)
+	private String customer;
+	/**集装箱代号*/
+	@ApiModelProperty(value = "集装箱代号")
+  	@Excel(name = "集装箱代号", width = 15)
+	private String containerCode;
+	/**集装箱号*/
+	@ApiModelProperty(value = "集装箱号")
+  	@Excel(name = "集装箱号", width = 15)
+	private String containerNumber;
+	/**u8备注*/
+	@ApiModelProperty(value = "u8备注")
+  	@Excel(name = "u8备注", width = 15)
+	private Object u8Remarks;
+	/**成衣工厂*/
+	@ApiModelProperty(value = "成衣工厂")
+  	@Excel(name = "成衣工厂", width = 15)
+	private String garmentFactory;
+	/**总箱数*/
+	@ApiModelProperty(value = "总箱数")
+  	@Excel(name = "总箱数", width = 15)
+	private java.math.BigDecimal totalBoxes;
+	/**总净重*/
+	@ApiModelProperty(value = "总净重")
+  	@Excel(name = "总净重", width = 15)
+	private java.math.BigDecimal totalNetWeight;
+	/**总毛重*/
+	@ApiModelProperty(value = "总毛重")
+  	@Excel(name = "总毛重", width = 15)
+	private java.math.BigDecimal totalGrossWeight;
+	/**总体积*/
+	@ApiModelProperty(value = "总体积")
+  	@Excel(name = "总体积", width = 15)
+	private java.math.BigDecimal totalVolume;
+	/**总价*/
+	@ApiModelProperty(value = "总价")
+  	@Excel(name = "总价", width = 15)
+	private java.math.BigDecimal totalPrice;
+	/**预托书号*/
+	@ApiModelProperty(value = "预托书号")
+  	@Excel(name = "预托书号", width = 15)
+	private String depositaryReceiptNo;
+	/**推送状态0未推送1推送成功2推送失败*/
+	@ApiModelProperty(value = "推送状态0未推送1推送成功2推送失败")
+  	@Excel(name = "推送状态0未推送1推送成功2推送失败", width = 15)
+	private String pushStatus;
+	/**单据装填0未提交1已提交*/
+	@ApiModelProperty(value = "单据装填0未提交1已提交")
+  	@Excel(name = "单据装填0未提交1已提交", width = 15)
+	private String status;
+	/**创建人*/
+	@ApiModelProperty(value = "创建人")
+  	@Excel(name = "创建人", width = 15)
+	private String createBy;
+	/**创建日期*/
+	@ApiModelProperty(value = "创建日期")
+  	@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 Date createTime;
+	/**更新人*/
+	@ApiModelProperty(value = "更新人")
+  	@Excel(name = "更新人", width = 15)
+	private String updateBy;
+	/**更新日期*/
+	@ApiModelProperty(value = "更新日期")
+  	@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 Date updateTime;
+	/**组织*/
+	@ApiModelProperty(value = "组织")
+  	@Excel(name = "组织", width = 15)
+	private String pkOrg;
+	/**删除状态*/
+	@ApiModelProperty(value = "删除状态")
+  	@Excel(name = "删除状态", width = 15)
+	private String delFlag;
+	/**备注*/
+	@ApiModelProperty(value = "备注")
+  	@Excel(name = "备注", width = 15)
+	private Object memo;
+
+	/**预发货日期*/
+	@ApiModelProperty(value = "预发货日期")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "预发货日期", width = 20)
+	private Date preDeliveryDate;
+	//**小PO*//*
+	@ApiModelProperty(value = "小PO")
+	@Excel(name = "小PO", width = 20)
+	private String smallPo;
+	/**分销点*/
+	@ApiModelProperty(value = "分销点")
+	@Excel(name = "分销点", width = 20)
+	private String distributionPoint;
+	/**存货名称*/
+	@ApiModelProperty(value = "存货名称")
+	@Excel(name = "存货名称", width = 20)
+	private String inventoryName;
+	/**颜色*/
+	@ApiModelProperty(value = "颜色")
+	@Excel(name = "颜色", width = 20)
+	private String colour;
+	/**采购/委外订单号*/
+	@ApiModelProperty(value = "采购/委外订单号")
+	@Excel(name = "采购/委外订单号", width = 20)
+	private String spurOrSubOrder;
+	/**订单类型*/
+	@ApiModelProperty(value = "订单类型")
+	@Excel(name = "订单类型", width = 20)
+	private String orderType;
+	//**工厂单价*//*
+	@ApiModelProperty(value = "工厂单价")
+	@Excel(name = "工厂单价", width = 20)
+	private java.math.BigDecimal factoryUnitPrice;
+	//**数量（按合并规则累计）*//*
+	@ApiModelProperty(value = "数量（按合并规则累计）")
+	@Excel(name = "数量（按合并规则累计）", width = 20)
+	private java.math.BigDecimal totalQuantity;
+
+	
+}

jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -131,9 +131,11 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #url: jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: CuiDian1234
+          #password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
         #多数据源配置
         multi-one:
@@ -141,6 +143,18 @@ spring:
           username: cuidian
           password: cuidianUFdata
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #多数据源配置
+        multi-two:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #多数据源配置
+        multi-three:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
     database: 0

jeecg-boot-module-system/target/classes/application-cuidian.yml

@@ -141,6 +141,17 @@ spring:
           username: cuidian
           password: cuidianUFdata
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
   #redis 配置
   redis:
     database: 0

jeecg-boot-module-system/target/classes/application-dev.yml

@@ -131,9 +131,11 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          #url: jdbc:mysql://localhost:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: CuiDian1234
+          #password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
         #多数据源配置
         multi-one:
@@ -141,6 +143,18 @@ spring:
           username: cuidian
           password: cuidianUFdata
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #多数据源配置
+        multi-two:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        #多数据源配置
+        multi-three:
+          url: jdbc:sqlserver://106.15.32.1:1433;SelectMethod=cursor;DatabaseName=UFDATA
+          username: cuidian
+          password: cuidianUFdata
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
     database: 0

jeecg-boot-module-system/target/classes/application-prod.yml

@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
-#        validationQuery: SELECT 1 FROM DUAL
+        #        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://106.15.206.14:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -151,21 +151,21 @@ spring:
           username: sa
           password: Windows2008R2
           driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#        multi-one:
-#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
-#          username: sa
-#          password: Windows2008R2
-#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#        multi-two:
-#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
-#          username: sa
-#          password: Windows2008R2
-#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#        multi-three:
-#          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
-#          username: sa
-#          password: Windows2008R2
-#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-one:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-two:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+  #        multi-three:
+  #          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
+  #          username: sa
+  #          password: Windows2008R2
+  #          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
   #redis 配置
   redis:
@@ -193,7 +193,7 @@ mybatis-plus:
       table-underline: true
   configuration:
     # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # 返回类型为Map,显示null对应的字段
     call-setters-on-nulls: true
 #jeecg专用配置
@@ -212,7 +212,7 @@ jeecg :
     #webapp文件路径
     webapp: /opt/jeecg-boot/webapp
   shiro:
-     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
+    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
   #阿里云oss存储和大鱼短信秘钥配置
   oss:
     accessKey: ??

jeecg-boot-module-system/target/classes/application.yml

@@ -2,4 +2,4 @@ spring:
   application:
     name: jeecg-system
   profiles:
-    active: test
+    active: dev

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationAccidentMapper.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.cost.mapper.SyCostAllocationAccidentMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_cost_allocation_accident 
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationAccident">
+		SELECT * 
+		FROM  sy_cost_allocation_accident
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationCostpayMapper.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.cost.mapper.SyCostAllocationCostpayMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_cost_allocation_costpay 
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationCostpay">
+		SELECT * 
+		FROM  sy_cost_allocation_costpay
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationFabricMapper.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.cost.mapper.SyCostAllocationFabricMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_cost_allocation_fabric 
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationFabric">
+		SELECT * 
+		FROM  sy_cost_allocation_fabric
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationIngredientMapper.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.cost.mapper.SyCostAllocationIngredientMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_cost_allocation_ingredient 
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationIngredient">
+		SELECT * 
+		FROM  sy_cost_allocation_ingredient
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.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.cost.mapper.SyCostAllocationMapper">
+
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.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.cost.mapper.SyCostAllocationShipdetailMapper">
+
+	<delete id="deleteByMainId" parameterType="java.lang.String">
+		DELETE 
+		FROM  sy_cost_allocation_shipdetail 
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</delete>
+	
+	<select id="selectByMainId" parameterType="java.lang.String" resultType="org.jeecg.modules.cost.entity.SyCostAllocationShipdetail">
+		SELECT * 
+		FROM  sy_cost_allocation_shipdetail
+		WHERE
+			 sy_cost_allocation_id = #{id} 		
+	</select>
+</mapper>

jeecg-boot-module-system/target/classes/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -4,11 +4,11 @@
 
     <select id="queryOrderData" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
 
-        select a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
-         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_text as businessTypeText,a.customer_order_number as customerOrderNumber,
-           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,surplus_num as surplusNum,
+        select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
+         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
+           a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,
-           b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,
+           b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,b.unit_price_including_tax as unitPriceIncludingTax,
            a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
             a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
              a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription from sy_order_data a
@@ -26,13 +26,13 @@
     sum(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,b.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,
+    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,a.pre_completion_date as preCompletionDate,
-    b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,b.whole_order_total as wholeOrderTotal,
-    b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,b.chinese_name as chineseName,b.ac_set_no as acSetNo,
-    b.english_name as englishName,b.garment_factory as garmentFactory from sy_shipping_details a
+    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,a.garment_factory as garmentFactory 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 group by a.id order by a.document_no desc) as t
@@ -49,10 +49,18 @@ ${ew.customSqlSegment}
 
     <select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO">
 
-        select '103' as tenantId,id as accessoriesHeaderId,'ACCESSORIES0609-2' as packingHeaderNum,
-        'ACCESSORIES' as packingType,'NEW' as packingStatus,'PO36202206070001' as poNo,'JAZS001' as containerNumm,
-         '2022-06-07' as loadingDate,'01000229' as supplierNumber,
-          '' as invoiceNum,'蒋岗峰' as preparer,'2022-06-02 08:26:24' as preparationTime
+        select account as tenantId,
+        id as accessoriesHeaderId,
+        document_no as packingHeaderNum,--'ACCESSORIES0609-2'
+        'ACCESSORIES' as packingType,
+        'NEW' as packingStatus,
+        --'PO36202206070001' as poNo,
+        --'JAZS001' as containerNumm,
+       --  '2022-06-07' as loadingDate,
+         '01000229' as supplierNumber,
+          --'' as invoiceNum,
+          create_by as preparer,
+          create_time as preparationTime
           from sy_shipping_details
          where del_flag = 0 and id = #{id}
 
@@ -60,16 +68,49 @@ ${ew.customSqlSegment}
 
     <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
 
-        select '103' as tenantId,
-          id as accessoriesLineId,id as accessoriesHeaderIdD,'1' as packingLineNum,'T0036' as merchandiser,'PO36202206070001' as poNo,
-          '' as moDetailId,'' as poId, 'W21-W20-MSP-SPW0001' as styleNo, 'C156St2' as batchNo,'藏青' as color,'N0201002139' as itemCode,'' as itemId,
-          '全涤绒布' as itemDesc,'针织布' as declarationName,'全涤' as composition,'190' as width,'' as rolls, '43' as planPackingQty,
-          '21' as actualPackingQty,'33' as grossWeight,'21' as netWeight,'32' as length,'' as clothWeight,'12' as cartons,
-          '6.32' as unitPrice,'45.21' as totalPrice,'' as gramWeight,'01000229' as supplierNumber,'' as supplierId,'' as supplierTenantId,
-          '打卷' as packingMethod,'染色' as treatmentMethod,'1' as manualYarnFlag,'0' as manualYarnUnitPrice,'0' as manualYarnProportion,
-          '无' as remark,'111' as cabinetNum
-          from sy_shipping_details_item
-          where del_flag = 0 and shipping_details_id = #{shippingDetailsId}
+        select
+        --'103' as tenantId,
+         -- a.id as accessoriesLineId,
+          --id as accessoriesHeaderIdD,
+          a.sort as packingLineNum,
+          'T0036' as merchandiser,
+          a.order_number as poNo,--'PO36202206070001'
+          a.sy_order_data_id as moDetailId,
+           --'' as poId,
+          a.item_number as styleNo, --'W21-W20-MSP-SPW0001'
+         -- 'C156St2' as batchNo,
+           b.colour as color,
+           'N0201002139' as itemCode,
+           '' as itemId,
+          '全涤绒布' as itemDesc,
+          '针织布' as declarationName,
+          '全涤' as composition,
+          '190' as width,
+          '' as rolls,
+          '43' as planPackingQty,
+          '21' as actualPackingQty,
+          '33' as grossWeight,
+          '21' as netWeight,
+          '32' as length,
+          '' as clothWeight,
+          '12' as cartons,
+          '6.32' as unitPrice,
+          '45.21' as totalPrice,
+          '' as gramWeight,
+          '01000229' as supplierNumber,
+          '' as supplierId,
+          '' as supplierTenantId,
+          '打卷' as packingMethod,
+          a.treatment_method as treatmentMethod,
+          a.manual_yarn_flag as manualYarnFlag,
+          a.manual_yarn_unit_price as manualYarnUnitPrice,
+          a.manual_yarn_proportion as manualYarnProportion,
+          a.memo as remark,
+          '111' as cabinetNum
+          from sy_shipping_details_item a
+          left join sy_order_data_item b
+          on a.sy_order_data_item_id = b.id
+          where a.del_flag = 0 and a.shipping_details_id = #{shippingDetailsId}
     </select>
 
 

jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -7,7 +7,7 @@
     </select>
 
     <select id="getMaxCode" resultType="java.lang.String">
-        select top 1 ${code} from ${tableName} ORDER BY dDate desc
+        select top 1 ${code} from ${tableName} ORDER BY ${dDate} desc
     </select>
 
     <insert id="saveRdRecord01One">
@@ -40,7 +40,9 @@
         dVeriDate,
         dnverifytime,
         cDefine13,
-        ipurorderid
+        ipurorderid,
+        iExchRate,
+        cExch_Name
         )
         VALUES
         (
@@ -65,13 +67,15 @@
         #{RdRecord01.cSource},
         0,
         0,
-        '陈创',
+        #{RdRecord01.cMaker},
         CONVERT(varchar,GETDATE(),20),
-        '陈创',
+        #{RdRecord01.cHandler},
         CONVERT(varchar,GETDATE(),23),
         CONVERT(varchar,GETDATE(),20),
         #{RdRecord01.cOrderCode},
-        #{RdRecord01.ipurorderid}
+        #{RdRecord01.ipurorderid},
+        #{RdRecord01.iExchRate},
+        #{RdRecord01.cExch_Name}
         )
     </insert>
 
@@ -169,9 +173,23 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
-        cBatchProperty9
+        cBatchProperty9,
+        iOriTaxCost,
+        iOriCost,
+        iOriMoney,
+        iTax,
+        ioriSum,
+        iUnitCost,
+        iPrice,
+        iAPrice,
+        iOriTaxPrice,
+        iTaxRate,
+        iTaxPrice,
+        iSum,
+        bTaxCost,
+        iProcessFee
         )
         VALUES
         (
@@ -219,9 +237,23 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
-        #{map.cBatchProperty9}
+        #{map.cBatchProperty9},
+        #{map.iOriTaxCost},
+        #{map.iOriCost},
+        #{map.iOriMoney},
+        #{map.iTax},
+        #{map.ioriSum},
+        #{map.iUnitCost},
+        #{map.iPrice},
+        #{map.iAPrice},
+        #{map.iOriTaxPrice},
+        #{map.iTaxRate},
+        #{map.iTaxPrice},
+        #{map.iSum},
+        #{map.bTaxCost},
+        #{map.iProcessFee }
         )
     </insert>
 
@@ -252,7 +284,7 @@
         #{map.cPTCode},
         #{map.iTaxRate},
         0,
-        '陈创',
+        '云工厂管理员',
         '01',
         0,
         0,
@@ -294,7 +326,11 @@
     </insert>
 
     <select id="getWhCodeByVenCode" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select cVenCode,cVenDefine1,cVenDefine2,cVenAbbName from Vendor where cVenCode=#{cVenCode}
+        select cVenCode,cVenDefine1,cVenDefine2,cVenAbbName,cVenDefine3 from Vendor where cVenDefine3=#{cVenCode}
+    </select>
+
+    <select id="getVenCode" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select cVenCode,cVenDefine1,cVenDefine2,cVenAbbName,cVenDefine3 from Vendor where cVenCode=#{cVenCode}
     </select>
 
     <select id="getRdrecords01WriteQuantity" resultType="java.math.BigDecimal" parameterType="java.lang.String">
@@ -327,7 +363,7 @@
     </select>
 
     <update id="updatePodetailsfreceivedqty" parameterType="java.util.HashMap">
-        update PO_Podetails set freceivedqty=#{map.freceivedqty} where ID=#{map.ID}
+        update PO_Podetails set iReceivedQTY=#{map.iReceivedQTY} where ID=#{map.ID}
     </update>
 
     <select id="getOMMODetails" parameterType="java.lang.String" resultType="java.util.HashMap">
@@ -375,10 +411,10 @@
         #{map.cMPoCode},
         #{map.cDefine13},
         #{map.cPersonCode},
-        '陈创',
+        '云工厂管理员',
         0,
         89,
-        '陈创',
+        '云工厂管理员',
         null,
         CONVERT(varchar,GETDATE(),23),
         #{map.cPSPCode},
@@ -392,6 +428,18 @@
         )
     </insert>
 
+   <!-- <update id="updateTransVouch" parameterType="java.util.HashMap">
+        update TransVouch set cMPoCode=#{map.cMPoCode},cDefine13=#{map.cDefine13} where cTVCode=#{map.cTVCode}
+    </update>
+
+    <update id="updateTransVouchs" parameterType="java.util.HashMap">
+        update TransVouchs set MoDetailsID=#{map.MoDetailsID},comcode=#{map.comcode},invcode=#{map.invcode},iomids#{map.iomids} where autoID=#{map.autoID}
+    </update>
+
+    <select id="getTransVouchs" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        select * from TransVouchs where cTVCode=#{map.cTVCode} order by irowno asc
+    </select>-->
+
     <insert id="saveTransVouchs">
         INSERT into TransVouchs(comcode,
                                <!-- cDefine22,-->
@@ -425,7 +473,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9
         )
@@ -470,7 +518,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -494,9 +542,9 @@
         0,
         '09',
         '调拨',
-        '陈创',
+        '云工厂管理员',
         0,
-        '陈创',
+        '云工厂管理员',
         CONVERT(varchar,GETDATE(),23),
         0,
         0,
@@ -549,7 +597,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9
         )
@@ -598,7 +646,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -620,12 +668,12 @@
         #{map.cPersonCode},<!--业务员 调拨单业务员-->
         #{map.cDepCode},<!--部门 调拨单转出部门-->
         #{map.ID},
-        0,
+        1,
         '08',
         '调拨',
-        '陈创',
+        '云工厂管理员',
         0,
-        '陈创',
+        '云工厂管理员',
         CONVERT(varchar,GETDATE(),23),
         0,
         0,
@@ -676,7 +724,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9)
         VALUES(
@@ -724,7 +772,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -742,9 +790,8 @@
         update VoucherHistory set cNumber=#{cNumber} where CardNumber=#{cardNumber}
     </update>
 
-    <select id="getCurrentStockCount" resultType="java.lang.Integer" parameterType="java.util.HashMap">
-        SELECT COUNT
-                   ( * )
+    <select id="getCurrentStockCount" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        SELECT  *
         FROM
             CurrentStock
         WHERE
@@ -763,8 +810,27 @@
           AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
+
     <update id="updateCurrentStock" parameterType="java.util.HashMap">
-        update CurrentStock set iQuantity=iQuantity+#{map.iQuantity}
+        update CurrentStock set iQuantity=iQuantity+#{map.iQuantity},fAvaQuantity=fAvaQuantity+#{map.iQuantity}
+        WHERE
+            cWhCode = #{map.cWhCode}
+          AND cInvCode = #{map.cInvCode}
+          AND isnull(cBatch,'') = #{map.cBatch}
+          AND isnull(cFree1,'') = #{map.cFree1}
+          AND isnull(cFree2,'') = #{map.cFree2}
+          AND isnull(cFree3,'') = #{map.cFree3}
+          AND isnull(cFree4,'') = #{map.cFree4}
+          AND isnull(cFree5,'') = #{map.cFree5}
+          AND isnull(cFree6,'') = #{map.cFree6}
+          AND isnull(cFree7,'') = #{map.cFree7}
+          AND isnull(cFree8,'') = #{map.cFree8}
+          AND isnull(cFree9,'') = #{map.cFree9}
+          AND isnull(cFree10,'') = #{map.cFree10}
+    </update>
+
+    <update id="updateCurrentStockSubtract" parameterType="java.util.HashMap">
+        update CurrentStock set iQuantity=iQuantity-#{map.iQuantity},fAvaQuantity=fAvaQuantity-#{map.iQuantity}
         WHERE
             cWhCode = #{map.cWhCode}
           AND cInvCode = #{map.cInvCode}
@@ -800,13 +866,14 @@
     </select>
 
     <insert id="insertCurrentStock">
-        INSERT into CurrentStock(cWhCode,cInvCode,ItemId,cBatch,iQuantity,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10)
+        INSERT into CurrentStock(cWhCode,cInvCode,ItemId,cBatch,iQuantity,fAvaQuantity,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10)
         VALUES(
                #{map.cWhCode},
                #{map.cInvCode},
                #{map.ItemId},
                #{map.cBatch},
                #{map.iQuantity},
+               #{map.iQuantity},
                #{map.cFree1},
                #{map.cFree2},
                #{map.cFree3},
@@ -888,7 +955,7 @@
           ,cFree8 = #{map.cFree8}
           ,cFree9 = #{map.cFree9}
           ,cFree10 = #{map.cFree10}
-          ,cBatchProperty1=#{map.cBatchProperty1}
+          ,cBatchProperty2=#{map.cBatchProperty2}
           ,cBatchProperty8=#{map.cBatchProperty8}
           ,cBatchProperty9=#{map.cBatchProperty9}
         where cBatchPropertyGUID=#{map.cBatchPropertyGUID}
@@ -896,7 +963,7 @@
 
     <insert id="saveAA_BatchProperty">
         insert into AA_BatchProperty(
-            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty1,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
+            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty2,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
         )
         values
             (
@@ -912,7 +979,7 @@
                 #{map.cFree8},
                 #{map.cFree9},
                 #{map.cFree10},
-                #{map.cBatchProperty1},
+                #{map.cBatchProperty2},
                 #{map.cBatchProperty8},
                 #{map.cBatchProperty9},
                 #{map.cBatchPropertyGUID}
@@ -939,6 +1006,12 @@
            AND isnull(cFree10,'') = #{map.cFree10}
     </select>
 
+    <select id="getOM_MOMaterialsByMoIdAndCinvcode" resultType="java.util.HashMap" parameterType="java.util.HashMap">
+        select * from OM_MOMaterials where
+        MoDetailsID = #{map.MoDetailsID}
+        and cInvCode = #{map.cInvCode}
+    </select>
+
     <update id="updateOM_MOMaterialsfTransQty" parameterType="java.util.HashMap">
         update OM_MOMaterials set fTransQty=#{map.fTransQty} where MOMaterialsID=#{map.MOMaterialsID}
     </update>

jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/SubcontractingOrderMapper.xml

@@ -93,7 +93,7 @@
                 '委外订单',<!--14 单据来源-->
                 0, <!--15是否传递 0-->
                 0, <!--16是否传递 0-->
-                '陈创',<!--17创建人 验布机-->
+                '云工厂管理员',<!--17创建人 验布机-->
                 #{cOrderCode}, <!-- 18委外订单号-->
                 #{ipurorderid}, <!-- 19采购订单主表标识-->
                 getdate(),<!--20 创建时间-->

jeecg-boot-module-system/target/classes/org/jeecg/modules/productionScheduleReport/mapper/xml/ProductionScheduleMapper.xml

@@ -3,6 +3,56 @@
 <mapper namespace="org.jeecg.modules.productionScheduleReport.mapper.ProductionScheduleMapper">
 
     <select id="selectByPage" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
+        select -- top 100
+              c.cDepName -- 部门
+             ,d.cPersonName -- 业务员
+             ,a.cSOCode -- 销售订单号
+             ,p.PlanCode planCode-- 计划单号
+             ,e.cCusName -- 客户
+             ,a.cDefine12 -- 成衣加工厂
+             ,b.cInvCode -- 存货编码
+             ,f.cInvName -- 存货名称
+             ,b.cDefine22 itemNumber -- 款号
+             ,b.cFree1 color-- 颜色
+             ,min(a.dPreDateBT) dPreDateBT -- 交期
+             ,sum(b.iQuantity) iQuantity --订单数量
+             ,sum(b.iTaxUnitPrice) iTaxUnitPrice -- 原币含税单价
+             ,sum(b.iSum) total_sum -- 总额（原币）
+             ,sum(b.iNatSum/b.iQuantity) bb_price -- 单价（本币）
+             ,sum(b.iNatSum) iNatSum -- 总额（本币）
+             ,sum(b.icostsum) icostsum -- 实际发票成本
+             ,sum(b.foutquantity) foutquantity --已出库数量
+             ,sum(b.iKPQuantity) iKPQuantity --累计开票数量
+             ,sum(b.iKPMoney) iKPMoney -- 累计开票金额
+             ,f.pictureGUid pictureId -- 图片id
+             ,min(a.dDate) dDate -- 单据日期
+        from SO_SOMain a
+                 left join SO_SODetails b on a.id = b.id
+
+                 left join mps_netdemand m on a.cSOCode = m.SoCode and m.OrgDemSeq = b.iRowNo
+                 left join mps_plancode p on m.ProjectId = p.plancodeid
+
+                 left join Department c on c.cDepCode = a.cDepCode
+                 left join person d on d.cPersonCode = a.cPersonCode
+                 left join Customer e on e.cCusCode = a.cCusCode
+                 left join Inventory f on f.cInvCode = b.cInvCode
+
+            ${ew.customSqlSegment} and p.plancode is not null
+
+        group by
+            c.cDepName -- 部门
+               ,d.cPersonName -- 业务员
+               ,a.cSOCode -- 销售订单号
+               ,e.cCusName -- 客户
+               ,a.cDefine12 -- 成衣加工厂
+               ,b.cInvCode -- 存货编码
+               ,f.cInvName -- 存货名称
+               ,b.cDefine22 -- 款号
+               ,b.cFree1-- 颜色
+               ,f.pictureGUid -- 图片id
+                ,p.PlanCode
+    </select>
+   <select id="selectByPageXXXXX" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
 
         select --top 100
             c.cDepName -- 部门
@@ -40,4 +90,65 @@
     <select id="selectPicture" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
         select picture,cPicturetype from aa_picture where cGUid = #{pictureId}
     </select>
+
+    <select id="selectCaiGou" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionScheduleCaiGou">
+        select
+             '903' accId -- 账套信息
+             ,a.cPOID -- 采购订单号
+			 ,c.cVenName -- 供应商名称
+             ,b.cInvCode -- 存货编码
+             ,b.iNatUnitPrice -- 本币单价
+             ,d.cInvName -- 存货名称
+             ,b.iQuantity iQuantityLrp -- 计划数量（lrp）
+             ,b.iQuantity -- 数量
+             ,b.iReceivedQTY -- 累计入库数量
+             ,b.iInvQTY -- 累计开票数量
+             ,b.iInvMoney -- 累计开票金额
+             ,b.csocode -- 下游订单
+             ,b.iReceivedQTY  -- 使用数量
+             ,b.iQuantity - b.iReceivedQTY as surplusQty -- 余料
+
+        from PO_Pomain a
+                 left join PO_Podetails b on a.POID = b.POID
+                 left join Vendor c on a.cVenCode = c.cVenCode
+                 left join Inventory d on d.cInvCode = b.cInvCode
+        where b.planlotnumber = #{planNumber}
+    </select>
+
+
+    <select id="selectWeiWai" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionScheduleWeiWai">
+        select
+               '903' accId -- 账套信息
+             ,a.cCode -- 委外订单号
+			 ,c.cVenName -- 供应商名称
+             ,b.cInvCode -- 物料编码
+             ,d.cInvName -- 存货名称
+             ,b.cFree1 color -- 颜色
+             ,b.cFree4 -- 门幅
+             ,b.iUnitPrice -- 原币单价
+             ,b.iNatUnitPrice -- 本币单价
+             ,b.iQuantity iQuantityLrp -- 计划数量
+             ,b.iQuantity -- 数量
+             ,b.iReceivedQTY -- 累计入库数量
+             ,b.iInvQTY -- 累计开票数量
+             ,b.iInvMoney -- 累计开票金额
+             ,b.csocode -- 下游订单
+             ,b.iMaterialSendQty   -- 使用数量
+             ,b.iQuantity - b.iMaterialSendQty as surplusQty -- 余料
+             ,e.cInvCode cInvCodeZi --子件编码
+             ,f.cInvName cInvNameZi -- 子件名称
+             ,e.iQuantity iQuantityZi -- 子件应领数量
+             ,e.iSendQTY -- 子件已领数量
+             ,0 costZi -- 成本
+             ,0 purchaseCode -- 采购订单号
+        from OM_MOMain a
+                 left join OM_MODetails b on a.MOID = b.MOID
+                 left join Vendor c on a.cVenCode = c.cVenCode
+                 left join Inventory d on d.cInvCode = b.cInvCode
+                 left join OM_MOMaterials e on e.MoDetailsID = b.MoDetailsID
+                 left join Inventory f on f.cInvCode = e.cInvCode
+        where b.cPlanLotNumber = #{planNumber}
+    </select>
+
+
 </mapper>