Sfoglia il codice sorgente

后台 看板问题修改

chenc 4 anni fa
parent
commit
1fbc624165
16 ha cambiato i file con 893 aggiunte e 3 eliminazioni
  1. 31 3
      src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java
  2. 5 0
      src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java
  3. 287 0
      src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessController.java
  4. 239 0
      src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessItemController.java
  5. 77 0
      src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcess.java
  6. 73 0
      src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcessItem.java
  7. 17 0
      src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsTechnologicalProcessItemMapper.java
  8. 17 0
      src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsTechnologicalProcessMapper.java
  9. 5 0
      src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsTechnologicalProcessItemMapper.xml
  10. 5 0
      src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsTechnologicalProcessMapper.xml
  11. 16 0
      src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsTechnologicalProcessItemService.java
  12. 16 0
      src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsTechnologicalProcessService.java
  13. 25 0
      src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsTechnologicalProcessItemServiceImpl.java
  14. 65 0
      src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsTechnologicalProcessServiceImpl.java
  15. 8 0
      src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java
  16. 7 0
      src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

+ 31 - 3
src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -39,7 +39,9 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.appInterface.service.IFbsWorkingStatisticsService;
 import org.jeecg.modules.fbsBasedate.entity.FbsPersonnel;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
 import org.jeecg.modules.fbsBasedate.service.IFbsPersonnelService;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessItemService;
 import org.jeecg.modules.fbsInventory.entity.FbsInventory;
 import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
 import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
@@ -89,6 +91,8 @@ public class FbsWorkingStatisticsController {
 	 @Autowired
 	 private IFbsMomOrderService iFbsMomOrderService;
 	 @Autowired
+	 private IFbsTechnologicalProcessItemService iFbsTechnologicalProcessItemService;
+	 @Autowired
 	 private IFbsMomOrderdetailService iFbsMomOrderdetailService;
 	 @Value("${jeecg.path.upload}")
 	 private String upLoadPath;
@@ -173,7 +177,7 @@ public class FbsWorkingStatisticsController {
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
 		 ypffscSaleorderBQueryWrapper.like("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
 		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
-//		 ypffscSaleorderBQueryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
+		 ypffscSaleorderBQueryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
 //		 ypffscSaleorderBQueryWrapper.in("state", 0,1,2,3);
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
@@ -314,7 +318,7 @@ public class FbsWorkingStatisticsController {
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
 		 ypffscSaleorderBQueryWrapper.like("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
 		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
-//		 ypffscSaleorderBQueryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
+		 ypffscSaleorderBQueryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
 //		 ypffscSaleorderBQueryWrapper.eq("state", 1);
 
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
@@ -504,6 +508,12 @@ public class FbsWorkingStatisticsController {
 			 res.setCode("1");
 			 res.setMsg("已经超过标准数量,请确认");
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
+		 }else if(numberOfTasks.doubleValue()==(qualifiedNumber.add(latestCompletedQuantity).doubleValue())){
+		 	//做完了变成不可扫码
+			 FbsWorkshopDispatchList fbsWorkshopDispatchList=new FbsWorkshopDispatchList();
+			 fbsWorkshopDispatchList.setId(workshopDispatchList.getId());
+			 fbsWorkshopDispatchList.setIsScanCode("2");
+			 fbsWorkshopDispatchListService.updateById(fbsWorkshopDispatchList);
 		 }
 
 		 /////批号是否存在了
@@ -792,7 +802,7 @@ public class FbsWorkingStatisticsController {
 		 QueryWrapper<FbsWorkshopDispatchList> queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("production_order_number_name", sheetId).eq("del_flag", 0);
 		 queryWrapper.like("personnel_id_u8", userId);
-//		 queryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
+		 queryWrapper.lambda().eq(FbsWorkshopDispatchList::getIsScanCode,"1");
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(queryWrapper);
 		 if(list.size() < 1){
 			 res.setCode("1");
@@ -800,6 +810,23 @@ public class FbsWorkingStatisticsController {
 			 return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
 		 }
 
+		 LambdaQueryWrapper<FbsTechnologicalProcessItem> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+		 lambdaQueryWrapper.eq(FbsTechnologicalProcessItem::getFbsTechnologicalProcessId,list.get(0).getFbsTechnologicalProcessId());
+		 lambdaQueryWrapper.eq(FbsTechnologicalProcessItem::getDelFlag,"0");
+		 lambdaQueryWrapper.orderByAsc(FbsTechnologicalProcessItem::getSort);
+		 List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList=iFbsTechnologicalProcessItemService.list(lambdaQueryWrapper);
+
+		 //工艺下拉
+		 List<Map<String,Object>> mapList=new ArrayList<>();
+		 if(fbsTechnologicalProcessItemList!=null){
+		 	for(FbsTechnologicalProcessItem fbsTechnologicalProcessItem:fbsTechnologicalProcessItemList){
+				Map<String,Object> map=new HashMap<>();
+				map.put("fbsTechnologicalProcessItemId",fbsTechnologicalProcessItem.getId());
+				map.put("fbsTechnologicalProcessItemName",fbsTechnologicalProcessItem.getName());
+				mapList.add(map);
+			}
+		 }
+
 		 FbsWorkshopDispatchList entity = list.get(0);
 		 Map<String,Object> map = new HashMap<>();
 		 map.put("orderCode",entity.getProductionOrderNumberName());
@@ -809,6 +836,7 @@ public class FbsWorkingStatisticsController {
 		 map.put("startDate",entity.getPlannedStartTime());
 		 map.put("endDate",entity.getPlannedEndTime());
 		 map.put("plannedQuantity",entity.getPlannedQuantity());
+		 map.put("fbsTechnologicalProcessItemList",mapList);
 		 res.setCode("0");
 		 res.setMsg("成功");
 		 res.setData(map);

+ 5 - 0
src/main/java/org/jeecg/modules/appInterface/entity/FbsWorkingStatistics.java

@@ -108,6 +108,11 @@ public class FbsWorkingStatistics implements Serializable {
 	//物料行号
 	private String rowNumber;
 
+	//工艺子表id
+	private String fbsTechnologicalProcessItemId;
+	//工艺子表名称
+	private String fbsTechnologicalProcessItemName;
+
 	//产品名称
 	@TableField(exist = false)
 	private String product;

+ 287 - 0
src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessController.java

@@ -0,0 +1,287 @@
+package org.jeecg.modules.fbsBasedate.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 工艺流程档案
+ * @author: jeecg-boot
+ * @date:   2021-01-14
+ * @version: V1.0
+ */
+@RestController
+@RequestMapping("/fbsBasedate/fbsTechnologicalProcess")
+@Slf4j
+public class FbsTechnologicalProcessController {
+	@Autowired
+	private IFbsTechnologicalProcessService fbsTechnologicalProcessService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsTechnologicalProcess
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsTechnologicalProcess>> queryPageList(FbsTechnologicalProcess fbsTechnologicalProcess,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsTechnologicalProcess>> result = new Result<IPage<FbsTechnologicalProcess>>();
+		QueryWrapper<FbsTechnologicalProcess> queryWrapper = QueryGenerator.initQueryWrapper(fbsTechnologicalProcess, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsTechnologicalProcess::getDelFlag,"0");
+		Page<FbsTechnologicalProcess> page = new Page<FbsTechnologicalProcess>(pageNo, pageSize);
+		IPage<FbsTechnologicalProcess> pageList = fbsTechnologicalProcessService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsTechnologicalProcess
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsTechnologicalProcess> add(@RequestBody FbsTechnologicalProcess fbsTechnologicalProcess) {
+		Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		try {
+			fbsTechnologicalProcessService.save(fbsTechnologicalProcess);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsTechnologicalProcess
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsTechnologicalProcess> edit(@RequestBody FbsTechnologicalProcess fbsTechnologicalProcess) {
+		Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		FbsTechnologicalProcess fbsTechnologicalProcessEntity = fbsTechnologicalProcessService.getById(fbsTechnologicalProcess.getId());
+		if(fbsTechnologicalProcessEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsTechnologicalProcessService.updateById(fbsTechnologicalProcess);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsTechnologicalProcess> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		FbsTechnologicalProcess fbsTechnologicalProcess = fbsTechnologicalProcessService.getById(id);
+		if(fbsTechnologicalProcess==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsTechnologicalProcessService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsTechnologicalProcess> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.fbsTechnologicalProcessService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsTechnologicalProcess> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		FbsTechnologicalProcess fbsTechnologicalProcess = fbsTechnologicalProcessService.getById(id);
+		if(fbsTechnologicalProcess==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsTechnologicalProcess);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsTechnologicalProcess> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsTechnologicalProcess fbsTechnologicalProcess = JSON.parseObject(deString, FbsTechnologicalProcess.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsTechnologicalProcess, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsTechnologicalProcess> pageList = fbsTechnologicalProcessService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "工艺流程档案列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsTechnologicalProcess.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("工艺流程档案列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsTechnologicalProcess> listFbsTechnologicalProcesss = ExcelImportUtil.importExcel(file.getInputStream(), FbsTechnologicalProcess.class, params);
+              for (FbsTechnologicalProcess fbsTechnologicalProcessExcel : listFbsTechnologicalProcesss) {
+                  fbsTechnologicalProcessService.save(fbsTechnologicalProcessExcel);
+              }
+              return Result.ok("文件导入成功!数据行数:" + listFbsTechnologicalProcesss.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败!");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+	/**
+	* @Author chenchuang
+	* @Description //TODO 添加主表和子表明细
+	* @Date 2021/1/16 13:57
+	* @Param [fbsTechnologicalProcess]
+	* @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess>
+	*/
+	 @PostMapping(value = "/addAll")
+	 public Result<FbsTechnologicalProcess> addAll(@RequestBody FbsTechnologicalProcess fbsTechnologicalProcess) {
+		 Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		 try {
+			 fbsTechnologicalProcessService.addAll(fbsTechnologicalProcess);
+			 result.success("添加成功!");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 log.info(e.getMessage());
+			 result.error500("操作失败");
+		 }
+		 return result;
+	 }
+
+	/**
+	* @Author chenchuang
+	* @Description //TODO 修改全部
+	* @Date 2021/1/16 14:17
+	* @Param [fbsTechnologicalProcess]
+	* @return org.jeecg.common.api.vo.Result<org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess>
+	*/
+	 @PutMapping(value = "/editAll")
+	 public Result<FbsTechnologicalProcess> editAll(@RequestBody FbsTechnologicalProcess fbsTechnologicalProcess) {
+		 Result<FbsTechnologicalProcess> result = new Result<FbsTechnologicalProcess>();
+		 FbsTechnologicalProcess fbsTechnologicalProcessEntity = fbsTechnologicalProcessService.getById(fbsTechnologicalProcess.getId());
+		 if(fbsTechnologicalProcessEntity==null) {
+			 result.error500("未找到对应实体");
+		 }else {
+			 try {
+				 fbsTechnologicalProcessService.updateAll(fbsTechnologicalProcess);
+				 result.success("修改成功!");
+			 } catch (Exception e) {
+				 e.printStackTrace();
+				 result.error500("修改失败:"+e.getMessage());
+			 }
+
+		 }
+		 return result;
+	 }
+}

+ 239 - 0
src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsTechnologicalProcessItemController.java

@@ -0,0 +1,239 @@
+package org.jeecg.modules.fbsBasedate.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessItemService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+
+ /**
+ * @Title: Controller
+ * @Description: 工艺流程明细
+ * @author: jeecg-boot
+ * @date:   2021-01-16
+ * @version: V1.0
+ */
+@RestController
+@RequestMapping("/fbsBasedate/fbsTechnologicalProcessItem")
+@Slf4j
+public class FbsTechnologicalProcessItemController {
+	@Autowired
+	private IFbsTechnologicalProcessItemService fbsTechnologicalProcessItemService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsTechnologicalProcessItem
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsTechnologicalProcessItem>> queryPageList(FbsTechnologicalProcessItem fbsTechnologicalProcessItem,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsTechnologicalProcessItem>> result = new Result<IPage<FbsTechnologicalProcessItem>>();
+		QueryWrapper<FbsTechnologicalProcessItem> queryWrapper = QueryGenerator.initQueryWrapper(fbsTechnologicalProcessItem, req.getParameterMap());
+		queryWrapper.lambda().eq(FbsTechnologicalProcessItem::getDelFlag,"0");
+		queryWrapper.lambda().orderByAsc(FbsTechnologicalProcessItem::getSort);
+		Page<FbsTechnologicalProcessItem> page = new Page<FbsTechnologicalProcessItem>(pageNo, pageSize);
+		IPage<FbsTechnologicalProcessItem> pageList = fbsTechnologicalProcessItemService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsTechnologicalProcessItem
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsTechnologicalProcessItem> add(@RequestBody FbsTechnologicalProcessItem fbsTechnologicalProcessItem) {
+		Result<FbsTechnologicalProcessItem> result = new Result<FbsTechnologicalProcessItem>();
+		try {
+			fbsTechnologicalProcessItemService.save(fbsTechnologicalProcessItem);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsTechnologicalProcessItem
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsTechnologicalProcessItem> edit(@RequestBody FbsTechnologicalProcessItem fbsTechnologicalProcessItem) {
+		Result<FbsTechnologicalProcessItem> result = new Result<FbsTechnologicalProcessItem>();
+		FbsTechnologicalProcessItem fbsTechnologicalProcessItemEntity = fbsTechnologicalProcessItemService.getById(fbsTechnologicalProcessItem.getId());
+		if(fbsTechnologicalProcessItemEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsTechnologicalProcessItemService.updateById(fbsTechnologicalProcessItem);
+			//TODO 返回false说明什么?
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsTechnologicalProcessItem> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsTechnologicalProcessItem> result = new Result<FbsTechnologicalProcessItem>();
+		FbsTechnologicalProcessItem fbsTechnologicalProcessItem = fbsTechnologicalProcessItemService.getById(id);
+		if(fbsTechnologicalProcessItem==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsTechnologicalProcessItemService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsTechnologicalProcessItem> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsTechnologicalProcessItem> result = new Result<FbsTechnologicalProcessItem>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.fbsTechnologicalProcessItemService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsTechnologicalProcessItem> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsTechnologicalProcessItem> result = new Result<FbsTechnologicalProcessItem>();
+		FbsTechnologicalProcessItem fbsTechnologicalProcessItem = fbsTechnologicalProcessItemService.getById(id);
+		if(fbsTechnologicalProcessItem==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsTechnologicalProcessItem);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsTechnologicalProcessItem> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsTechnologicalProcessItem fbsTechnologicalProcessItem = JSON.parseObject(deString, FbsTechnologicalProcessItem.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsTechnologicalProcessItem, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsTechnologicalProcessItem> pageList = fbsTechnologicalProcessItemService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "工艺流程明细列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsTechnologicalProcessItem.class);
+      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("工艺流程明细列表数据", "导出人:Jeecg", "导出信息"));
+      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+      return mv;
+  }
+
+  /**
+      * 通过excel导入数据
+   *
+   * @param request
+   * @param response
+   * @return
+   */
+  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+          MultipartFile file = entity.getValue();// 获取上传文件对象
+          ImportParams params = new ImportParams();
+          params.setTitleRows(2);
+          params.setHeadRows(1);
+          params.setNeedSave(true);
+          try {
+              List<FbsTechnologicalProcessItem> listFbsTechnologicalProcessItems = ExcelImportUtil.importExcel(file.getInputStream(), FbsTechnologicalProcessItem.class, params);
+              for (FbsTechnologicalProcessItem fbsTechnologicalProcessItemExcel : listFbsTechnologicalProcessItems) {
+                  fbsTechnologicalProcessItemService.save(fbsTechnologicalProcessItemExcel);
+              }
+              return Result.ok("文件导入成功!数据行数:" + listFbsTechnologicalProcessItems.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败!");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败!");
+  }
+
+}

+ 77 - 0
src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcess.java

@@ -0,0 +1,77 @@
+package org.jeecg.modules.fbsBasedate.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.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 工艺流程档案
+ * @author: jeecg-boot
+ * @date:   2021-01-14
+ * @version: V1.0
+ */
+@Data
+@TableName("fbs_technological_process")
+public class FbsTechnologicalProcess implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**工艺流程主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+	private String name;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	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 Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	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 Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+
+	//明细
+	@TableField(exist = false)
+	private List<FbsTechnologicalProcessItem> fbsTechnologicalProcessItemList;
+}

+ 73 - 0
src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsTechnologicalProcessItem.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.fbsBasedate.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * @Description: 工艺流程明细
+ * @author: jeecg-boot
+ * @date:   2021-01-16
+ * @version: V1.0
+ */
+@Data
+@TableName("fbs_technological_process_item")
+public class FbsTechnologicalProcessItem implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+	/**工艺流程子表主键*/
+	@TableId(type = IdType.UUID)
+	private String id;
+	/**工艺名称*/
+	@Excel(name = "工艺名称", width = 15)
+	private String name;
+	/**排序*/
+	@Excel(name = "排序", width = 15)
+	private Integer sort;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+	private String memo;
+	/**删除标记0正常1删除*/
+	@Excel(name = "删除标记0正常1删除", width = 15)
+	private String delFlag;
+	/**创建人*/
+	@Excel(name = "创建人", width = 15)
+	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 Date createTime;
+	/**最后修改人*/
+	@Excel(name = "最后修改人", width = 15)
+	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 Date updateTime;
+	/**自定义字段1*/
+	@Excel(name = "自定义字段1", width = 15)
+	private String def1;
+	/**自定义字段2*/
+	@Excel(name = "自定义字段2", width = 15)
+	private String def2;
+	/**自定义字段3*/
+	@Excel(name = "自定义字段3", width = 15)
+	private String def3;
+	/**自定义字段4*/
+	@Excel(name = "自定义字段4", width = 15)
+	private String def4;
+	/**自定义字段5*/
+	@Excel(name = "自定义字段5", width = 15)
+	private String def5;
+	/**主表id*/
+	@Excel(name = "主表id", width = 15)
+	private String fbsTechnologicalProcessId;
+}

+ 17 - 0
src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsTechnologicalProcessItemMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsBasedate.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 工艺流程明细
+ * @author: jeecg-boot
+ * @date:   2021-01-16
+ * @version: V1.0
+ */
+public interface FbsTechnologicalProcessItemMapper extends BaseMapper<FbsTechnologicalProcessItem> {
+
+}

+ 17 - 0
src/main/java/org/jeecg/modules/fbsBasedate/mapper/FbsTechnologicalProcessMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsBasedate.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 工艺流程档案
+ * @author: jeecg-boot
+ * @date:   2021-01-14
+ * @version: V1.0
+ */
+public interface FbsTechnologicalProcessMapper extends BaseMapper<FbsTechnologicalProcess> {
+
+}

+ 5 - 0
src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsTechnologicalProcessItemMapper.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.fbsBasedate.mapper.FbsTechnologicalProcessItemMapper">
+
+</mapper>

+ 5 - 0
src/main/java/org/jeecg/modules/fbsBasedate/mapper/xml/FbsTechnologicalProcessMapper.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.fbsBasedate.mapper.FbsTechnologicalProcessMapper">
+
+</mapper>

+ 16 - 0
src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsTechnologicalProcessItemService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.fbsBasedate.service;
+
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 工艺流程明细
+ * @author: jeecg-boot
+ * @date:   2021-01-16
+ * @version: V1.0
+ */
+public interface IFbsTechnologicalProcessItemService extends IService<FbsTechnologicalProcessItem> {
+
+
+}

+ 16 - 0
src/main/java/org/jeecg/modules/fbsBasedate/service/IFbsTechnologicalProcessService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.fbsBasedate.service;
+
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 工艺流程档案
+ * @author: jeecg-boot
+ * @date:   2021-01-14
+ * @version: V1.0
+ */
+public interface IFbsTechnologicalProcessService extends IService<FbsTechnologicalProcess> {
+    void addAll(FbsTechnologicalProcess fbsTechnologicalProcess);
+
+    void updateAll(FbsTechnologicalProcess fbsTechnologicalProcess);
+}

+ 25 - 0
src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsTechnologicalProcessItemServiceImpl.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.fbsBasedate.service.impl;
+
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import org.jeecg.modules.fbsBasedate.mapper.FbsTechnologicalProcessItemMapper;
+import org.jeecg.modules.fbsBasedate.mapper.FbsTechnologicalProcessMapper;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 工艺流程明细
+ * @author: jeecg-boot
+ * @date:   2021-01-16
+ * @version: V1.0
+ */
+@Service
+public class FbsTechnologicalProcessItemServiceImpl extends ServiceImpl<FbsTechnologicalProcessItemMapper, FbsTechnologicalProcessItem> implements IFbsTechnologicalProcessItemService {
+
+
+
+
+}

+ 65 - 0
src/main/java/org/jeecg/modules/fbsBasedate/service/impl/FbsTechnologicalProcessServiceImpl.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.fbsBasedate.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcess;
+import org.jeecg.modules.fbsBasedate.entity.FbsTechnologicalProcessItem;
+import org.jeecg.modules.fbsBasedate.mapper.FbsTechnologicalProcessItemMapper;
+import org.jeecg.modules.fbsBasedate.mapper.FbsTechnologicalProcessMapper;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessItemService;
+import org.jeecg.modules.fbsBasedate.service.IFbsTechnologicalProcessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 工艺流程档案
+ * @author: jeecg-boot
+ * @date:   2021-01-14
+ * @version: V1.0
+ */
+@Service
+public class FbsTechnologicalProcessServiceImpl extends ServiceImpl<FbsTechnologicalProcessMapper, FbsTechnologicalProcess> implements IFbsTechnologicalProcessService {
+    @Autowired
+    private FbsTechnologicalProcessMapper fbsTechnologicalProcessMapper;
+    @Autowired
+    private FbsTechnologicalProcessItemMapper fbsTechnologicalProcessItemMapper;
+    @Autowired
+    private IFbsTechnologicalProcessItemService iFbsTechnologicalProcessItemService;
+    @Override
+    public void addAll(FbsTechnologicalProcess fbsTechnologicalProcess) {
+        //新增主表
+        fbsTechnologicalProcessMapper.insert(fbsTechnologicalProcess);
+        //新增子表数据
+        if(fbsTechnologicalProcess.getFbsTechnologicalProcessItemList()!=null){
+            addItem(fbsTechnologicalProcess);
+        }
+    }
+
+    public void addItem(FbsTechnologicalProcess fbsTechnologicalProcess){
+        for(FbsTechnologicalProcessItem fbsTechnologicalProcessItem:fbsTechnologicalProcess.getFbsTechnologicalProcessItemList()){
+            fbsTechnologicalProcessItem.setId(null);
+            fbsTechnologicalProcessItem.setFbsTechnologicalProcessId(fbsTechnologicalProcess.getId());
+            fbsTechnologicalProcessItem.setCreateBy(null);
+            fbsTechnologicalProcessItem.setCreateTime(null);
+        }
+        iFbsTechnologicalProcessItemService.saveBatch(fbsTechnologicalProcess.getFbsTechnologicalProcessItemList());
+    }
+
+    @Override
+    public void updateAll(FbsTechnologicalProcess fbsTechnologicalProcess) {
+        fbsTechnologicalProcessMapper.updateById(fbsTechnologicalProcess);
+        if(fbsTechnologicalProcess.getFbsTechnologicalProcessItemList()!=null&&fbsTechnologicalProcess.getFbsTechnologicalProcessItemList().size()>0){
+            //修改条件
+            LambdaQueryWrapper<FbsTechnologicalProcessItem> lambdaQueryWrapper=new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(FbsTechnologicalProcessItem::getDelFlag,"0");
+            lambdaQueryWrapper.eq(FbsTechnologicalProcessItem::getFbsTechnologicalProcessId,fbsTechnologicalProcess.getId());
+            //修改的值
+            FbsTechnologicalProcessItem fbsTechnologicalProcessItem=new FbsTechnologicalProcessItem();
+            fbsTechnologicalProcessItem.setDelFlag("1");
+            fbsTechnologicalProcessItemMapper.update(fbsTechnologicalProcessItem,lambdaQueryWrapper);
+            //新增明细
+            addItem(fbsTechnologicalProcess);
+        }
+    }
+}

+ 8 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -241,6 +241,14 @@ public class FbsWorkshopDispatchListController {
 			 //计划数量减去所有派工数量 获取剩余数量
 			 fbsWorkshopDispatchList.setRemainingQuantity(fbsWorkshopDispatchList.getPlannedQuantity().subtract(bigDecimal));
 			 fbsWorkshopDispatchListService.updateById(fbsWorkshopDispatchList);
+			 //更新该订单的所有剩余数量
+			 LambdaQueryWrapper<FbsWorkshopDispatchList> lambdaQueryWrapper1=new LambdaQueryWrapper<>();
+			 lambdaQueryWrapper1.eq(FbsWorkshopDispatchList::getDelFlag,"0");
+			 lambdaQueryWrapper1.eq(FbsWorkshopDispatchList::getProductionOrderNumberName,fbsWorkshopDispatchList.getProductionOrderNumberName());
+			 lambdaQueryWrapper1.eq(FbsWorkshopDispatchList::getProductId,fbsWorkshopDispatchList.getProductId());
+			 FbsWorkshopDispatchList fbsWorkshopDispatchListUpdate=new FbsWorkshopDispatchList();
+			 fbsWorkshopDispatchListUpdate.setRemainingQuantity(fbsWorkshopDispatchList.getPlannedQuantity().subtract(bigDecimal));
+			 fbsWorkshopDispatchListService.update(fbsWorkshopDispatchListUpdate,lambdaQueryWrapper1);
 			 //TODO 返回false说明什么?
 			 if(ok) {
 				 result.success("修改成功!");

+ 7 - 0
src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -143,6 +143,13 @@ public class FbsWorkshopDispatchList implements Serializable {
 	//是否可上岗
 	private String isScanCode;
 
+	//工艺主表id
+	private String fbsTechnologicalProcessId;
+	//工艺主表名称
+	private String fbsTechnologicalProcessName;
+	//工艺子表名称
+	private String fbsTechnologicalProcessItemName;
+
     //合并行
 	@TableField(exist = false)
     private Integer mergeLines;