U8数据接口

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/controller/FbsAbnormalWorkingHoursController.java

@@ -19,6 +19,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -50,6 +52,10 @@ public class FbsAbnormalWorkingHoursController {
 
 	@Autowired
 	private IFbsPersonService iFbsPersonService;
+
+	@Autowired
+	private IFbsMomOrderService iFbsMomOrderService;
+
 	/**
 	  * 分页列表查询
 	 * @param fbsAbnormalWorkingHours
@@ -317,4 +323,6 @@ public class FbsAbnormalWorkingHoursController {
 		 return result;
 	 }
 
+
+
 }

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/entity/FbsAbnormalWorkingHours.java

@@ -139,6 +139,10 @@ public class FbsAbnormalWorkingHours implements Serializable {
 	@Excel(name = "生产线名称", width = 15)
 	private String productionLineName;
 
+	/**生产线id*/
+	@Excel(name = "生产线id", width = 15)
+	private String productionLineId;
+
 	//异常工时描述集合
 	@TableField(exist = false)
 	private List<FbsAbnormalWorkingHoursDescribe> fbsAbnormalWorkingHoursDescribeList;

src/main/java/org/jeecg/modules/fbsAbnormalWorkingHours/service/impl/FbsAbnormalWorkingHoursServiceImpl.java

@@ -90,14 +90,14 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
     @Override
     public boolean updateAndChild(FbsAbnormalWorkingHours fbsAbnormalWorkingHours) {
         boolean resulet=true;
-//        //新增主表
-//        fbsAbnormalWorkingHoursMapper.updateById(fbsAbnormalWorkingHours);
-//        //物理删除子表旧数据
-//        deleteChild(fbsAbnormalWorkingHours);
-//        //新增子表
-//        addChild(fbsAbnormalWorkingHours);
-
-        pp();
+        //新增主表
+        fbsAbnormalWorkingHoursMapper.updateById(fbsAbnormalWorkingHours);
+        //物理删除子表旧数据
+        deleteChild(fbsAbnormalWorkingHours);
+        //新增子表
+        addChild(fbsAbnormalWorkingHours);
+
+
         return resulet;
     }
 
@@ -105,10 +105,6 @@ public class FbsAbnormalWorkingHoursServiceImpl extends ServiceImpl<FbsAbnormalW
     IFbsPersonService iFbsPersonService;
 
 
-    public void pp(){
-        List<FbsPerson> fbsPersonList=iFbsPersonService.list();
-    }
-
     /**
     * @Author chenchuang
     * @Description //TODO 物理删除子表数据

src/main/java/org/jeecg/modules/fbsInventory/controller/FbsInventoryController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsInventory.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.fbsInventory.entity.FbsInventory;
+import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
+
+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：   2020-10-16
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsInventory/fbsInventory")
+@Slf4j
+public class FbsInventoryController {
+	@Autowired
+	private IFbsInventoryService fbsInventoryService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsInventory
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsInventory>> queryPageList(FbsInventory fbsInventory,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsInventory>> result = new Result<IPage<FbsInventory>>();
+		QueryWrapper<FbsInventory> queryWrapper = QueryGenerator.initQueryWrapper(fbsInventory, req.getParameterMap());
+		Page<FbsInventory> page = new Page<FbsInventory>(pageNo, pageSize);
+		IPage<FbsInventory> pageList = fbsInventoryService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsInventory
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsInventory> add(@RequestBody FbsInventory fbsInventory) {
+		Result<FbsInventory> result = new Result<FbsInventory>();
+		try {
+			fbsInventoryService.save(fbsInventory);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsInventory
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsInventory> edit(@RequestBody FbsInventory fbsInventory) {
+		Result<FbsInventory> result = new Result<FbsInventory>();
+		FbsInventory fbsInventoryEntity = fbsInventoryService.getById(fbsInventory.getId());
+		if(fbsInventoryEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsInventoryService.updateById(fbsInventory);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsInventory> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsInventory> result = new Result<FbsInventory>();
+		FbsInventory fbsInventory = fbsInventoryService.getById(id);
+		if(fbsInventory==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsInventoryService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsInventory> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsInventory> result = new Result<FbsInventory>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsInventoryService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsInventory> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsInventory> result = new Result<FbsInventory>();
+		FbsInventory fbsInventory = fbsInventoryService.getById(id);
+		if(fbsInventory==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsInventory);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsInventory> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsInventory fbsInventory = JSON.parseObject(deString, FbsInventory.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsInventory, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsInventory> pageList = fbsInventoryService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "存库档案列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsInventory.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<FbsInventory> listFbsInventorys = ExcelImportUtil.importExcel(file.getInputStream(), FbsInventory.class, params);
+              for (FbsInventory fbsInventoryExcel : listFbsInventorys) {
+                  fbsInventoryService.save(fbsInventoryExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsInventorys.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsInventory/entity/FbsInventory.java

@@ -0,0 +1,812 @@
+package org.jeecg.modules.fbsInventory.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+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：   2020-10-16
+ * @version： V1.0
+ */
+@Data
+@TableName("Inventory")
+public class FbsInventory implements Serializable {
+    private static final long serialVersionUID = 1L;
+	/**id*/
+	@Excel(name = "id", width = 15)
+	@TableField(exist = false)
+	private String id;
+	/**cinvcode*/
+	@Excel(name = "cinvcode", width = 15)
+	private String cinvcode;
+	/**cinvaddcode*/
+	@Excel(name = "cinvaddcode", width = 15)
+	private String cinvaddcode;
+	/**cinvname*/
+	@Excel(name = "cinvname", width = 15)
+	private String cinvname;
+	/**cinvstd*/
+	@Excel(name = "cinvstd", width = 15)
+	private String cinvstd;
+	/**cinvccode*/
+	@Excel(name = "cinvccode", width = 15)
+	private String cinvccode;
+	/**cvencode*/
+	@Excel(name = "cvencode", width = 15)
+	private String cvencode;
+	/**creplaceitem*/
+	@Excel(name = "creplaceitem", width = 15)
+	private String creplaceitem;
+	/**cposition*/
+	@Excel(name = "cposition", width = 15)
+	private String cposition;
+	/**bsale*/
+	@Excel(name = "bsale", width = 15)
+	private Object bsale;
+	/**bpurchase*/
+	@Excel(name = "bpurchase", width = 15)
+	private Object bpurchase;
+	/**bself*/
+	@Excel(name = "bself", width = 15)
+	private Object bself;
+	/**bcomsume*/
+	@Excel(name = "bcomsume", width = 15)
+	private Object bcomsume;
+	/**bproducing*/
+	@Excel(name = "bproducing", width = 15)
+	private Object bproducing;
+	/**bservice*/
+	@Excel(name = "bservice", width = 15)
+	private Object bservice;
+	/**baccessary*/
+	@Excel(name = "baccessary", width = 15)
+	private Object baccessary;
+	/**itaxrate*/
+	@Excel(name = "itaxrate", width = 15)
+	private Float itaxrate;
+	/**iinvweight*/
+	@Excel(name = "iinvweight", width = 15)
+	private Float iinvweight;
+	/**ivolume*/
+	@Excel(name = "ivolume", width = 15)
+	private Float ivolume;
+	/**iinvrcost*/
+	@Excel(name = "iinvrcost", width = 15)
+	private Float iinvrcost;
+	/**iinvsprice*/
+	@Excel(name = "iinvsprice", width = 15)
+	private Float iinvsprice;
+	/**iinvscost*/
+	@Excel(name = "iinvscost", width = 15)
+	private Float iinvscost;
+	/**iinvlscost*/
+	@Excel(name = "iinvlscost", width = 15)
+	private Float iinvlscost;
+	/**iinvncost*/
+	@Excel(name = "iinvncost", width = 15)
+	private Float iinvncost;
+	/**iinvadvance*/
+	@Excel(name = "iinvadvance", width = 15)
+	private Float iinvadvance;
+	/**iinvbatch*/
+	@Excel(name = "iinvbatch", width = 15)
+	private Float iinvbatch;
+	/**isafenum*/
+	@Excel(name = "isafenum", width = 15)
+	private Float isafenum;
+	/**itopsum*/
+	@Excel(name = "itopsum", width = 15)
+	private Float itopsum;
+	/**ilowsum*/
+	@Excel(name = "ilowsum", width = 15)
+	private Float ilowsum;
+	/**ioverstock*/
+	@Excel(name = "ioverstock", width = 15)
+	private Float ioverstock;
+	/**cinvabc*/
+	@Excel(name = "cinvabc", width = 15)
+	private String cinvabc;
+	/**binvquality*/
+	@Excel(name = "binvquality", width = 15)
+	private Object binvquality;
+	/**binvbatch*/
+	@Excel(name = "binvbatch", width = 15)
+	private Object binvbatch;
+	/**binventrust*/
+	@Excel(name = "binventrust", width = 15)
+	private Object binventrust;
+	/**binvoverstock*/
+	@Excel(name = "binvoverstock", width = 15)
+	private Object binvoverstock;
+	/**dsdate*/
+	@Excel(name = "dsdate", 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 dsdate;
+	/**dedate*/
+	@Excel(name = "dedate", 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 dedate;
+	/**bfree1*/
+	@Excel(name = "bfree1", width = 15)
+	private Object bfree1;
+	/**bfree2*/
+	@Excel(name = "bfree2", width = 15)
+	private Object bfree2;
+	/**cinvdefine1*/
+	@Excel(name = "cinvdefine1", width = 15)
+	private String cinvdefine1;
+	/**cinvdefine2*/
+	@Excel(name = "cinvdefine2", width = 15)
+	private String cinvdefine2;
+	/**cinvdefine3*/
+	@Excel(name = "cinvdefine3", width = 15)
+	private String cinvdefine3;
+	/**iId*/
+	@Excel(name = "iId", width = 15)
+	private Integer iId;
+	/**binvtype*/
+	@Excel(name = "binvtype", width = 15)
+	private Object binvtype;
+	/**iinvmpcost*/
+	@Excel(name = "iinvmpcost", width = 15)
+	private Float iinvmpcost;
+	/**cquality*/
+	@Excel(name = "cquality", width = 15)
+	private String cquality;
+	/**iinvsalecost*/
+	@Excel(name = "iinvsalecost", width = 15)
+	private Float iinvsalecost;
+	/**iinvscost1*/
+	@Excel(name = "iinvscost1", width = 15)
+	private Float iinvscost1;
+	/**iinvscost2*/
+	@Excel(name = "iinvscost2", width = 15)
+	private Float iinvscost2;
+	/**iinvscost3*/
+	@Excel(name = "iinvscost3", width = 15)
+	private Float iinvscost3;
+	/**bfree3*/
+	@Excel(name = "bfree3", width = 15)
+	private Object bfree3;
+	/**bfree4*/
+	@Excel(name = "bfree4", width = 15)
+	private Object bfree4;
+	/**bfree5*/
+	@Excel(name = "bfree5", width = 15)
+	private Object bfree5;
+	/**bfree6*/
+	@Excel(name = "bfree6", width = 15)
+	private Object bfree6;
+	/**bfree7*/
+	@Excel(name = "bfree7", width = 15)
+	private Object bfree7;
+	/**bfree8*/
+	@Excel(name = "bfree8", width = 15)
+	private Object bfree8;
+	/**bfree9*/
+	@Excel(name = "bfree9", width = 15)
+	private Object bfree9;
+	/**bfree10*/
+	@Excel(name = "bfree10", width = 15)
+	private Object bfree10;
+	/**ccreateperson*/
+	@Excel(name = "ccreateperson", width = 15)
+	private String ccreateperson;
+	/**cmodifyperson*/
+	@Excel(name = "cmodifyperson", width = 15)
+	private String cmodifyperson;
+	/**dmodifydate*/
+	@Excel(name = "dmodifydate", 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 dmodifydate;
+	/**fsubscribepoint*/
+	@Excel(name = "fsubscribepoint", width = 15)
+	private Float fsubscribepoint;
+	/**fvagquantity*/
+	@Excel(name = "fvagquantity", width = 15)
+	private Float fvagquantity;
+	/**cvaluetype*/
+	@Excel(name = "cvaluetype", width = 15)
+	private String cvaluetype;
+	/**bfixexch*/
+	@Excel(name = "bfixexch", width = 15)
+	private Object bfixexch;
+	/**foutexcess*/
+	@Excel(name = "foutexcess", width = 15)
+	private Float foutexcess;
+	/**finexcess*/
+	@Excel(name = "finexcess", width = 15)
+	private Float finexcess;
+	/**imassdate*/
+	@Excel(name = "imassdate", width = 15)
+	private Integer imassdate;
+	/**iwarndays*/
+	@Excel(name = "iwarndays", width = 15)
+	private Integer iwarndays;
+	/**fexpensesexch*/
+	@Excel(name = "fexpensesexch", width = 15)
+	private Float fexpensesexch;
+	/**btrack*/
+	@Excel(name = "btrack", width = 15)
+	private Object btrack;
+	/**bserial*/
+	@Excel(name = "bserial", width = 15)
+	private Object bserial;
+	/**bbarcode*/
+	@Excel(name = "bbarcode", width = 15)
+	private Object bbarcode;
+	/**iid*/
+	@Excel(name = "iid", width = 15)
+	private Integer iid;
+	/**cbarcode*/
+	@Excel(name = "cbarcode", width = 15)
+	private String cbarcode;
+	/**cinvdefine4*/
+	@Excel(name = "cinvdefine4", width = 15)
+	private String cinvdefine4;
+	/**cinvdefine5*/
+	@Excel(name = "cinvdefine5", width = 15)
+	private String cinvdefine5;
+	/**cinvdefine6*/
+	@Excel(name = "cinvdefine6", width = 15)
+	private String cinvdefine6;
+	/**cinvdefine7*/
+	@Excel(name = "cinvdefine7", width = 15)
+	private String cinvdefine7;
+	/**cinvdefine8*/
+	@Excel(name = "cinvdefine8", width = 15)
+	private String cinvdefine8;
+	/**cinvdefine9*/
+	@Excel(name = "cinvdefine9", width = 15)
+	private String cinvdefine9;
+	/**cinvdefine10*/
+	@Excel(name = "cinvdefine10", width = 15)
+	private String cinvdefine10;
+	/**cinvdefine11*/
+	@Excel(name = "cinvdefine11", width = 15)
+	private Integer cinvdefine11;
+	/**cinvdefine12*/
+	@Excel(name = "cinvdefine12", width = 15)
+	private Integer cinvdefine12;
+	/**cinvdefine13*/
+	@Excel(name = "cinvdefine13", width = 15)
+	private Float cinvdefine13;
+	/**cinvdefine14*/
+	@Excel(name = "cinvdefine14", width = 15)
+	private Float cinvdefine14;
+	/**cinvdefine15*/
+	@Excel(name = "cinvdefine15", 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 cinvdefine15;
+	/**cinvdefine16*/
+	@Excel(name = "cinvdefine16", 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 cinvdefine16;
+	/**igrouptype*/
+	@Excel(name = "igrouptype", width = 15)
+	private Integer igrouptype;
+	/**cgroupcode*/
+	@Excel(name = "cgroupcode", width = 15)
+	private String cgroupcode;
+	/**ccomunitcode*/
+	@Excel(name = "ccomunitcode", width = 15)
+	private String ccomunitcode;
+	/**casscomunitcode*/
+	@Excel(name = "casscomunitcode", width = 15)
+	private String casscomunitcode;
+	/**csacomunitcode*/
+	@Excel(name = "csacomunitcode", width = 15)
+	private String csacomunitcode;
+	/**cpucomunitcode*/
+	@Excel(name = "cpucomunitcode", width = 15)
+	private String cpucomunitcode;
+	/**cstcomunitcode*/
+	@Excel(name = "cstcomunitcode", width = 15)
+	private String cstcomunitcode;
+	/**ccacomunitcode*/
+	@Excel(name = "ccacomunitcode", width = 15)
+	private String ccacomunitcode;
+	/**cfrequency*/
+	@Excel(name = "cfrequency", width = 15)
+	private String cfrequency;
+	/**ifrequency*/
+	@Excel(name = "ifrequency", width = 15)
+	private Integer ifrequency;
+	/**idays*/
+	@Excel(name = "idays", width = 15)
+	private Integer idays;
+	/**dlastdate*/
+	@Excel(name = "dlastdate", 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 dlastdate;
+	/**iwastage*/
+	@Excel(name = "iwastage", width = 15)
+	private Float iwastage;
+	/**bsolitude*/
+	@Excel(name = "bsolitude", width = 15)
+	private Object bsolitude;
+	/**centerprise*/
+	@Excel(name = "centerprise", width = 15)
+	private String centerprise;
+	/**caddress*/
+	@Excel(name = "caddress", width = 15)
+	private String caddress;
+	/**cfile*/
+	@Excel(name = "cfile", width = 15)
+	private String cfile;
+	/**clabel*/
+	@Excel(name = "clabel", width = 15)
+	private String clabel;
+	/**ccheckout*/
+	@Excel(name = "ccheckout", width = 15)
+	private String ccheckout;
+	/**clicence*/
+	@Excel(name = "clicence", width = 15)
+	private String clicence;
+	/**bspecialties*/
+	@Excel(name = "bspecialties", width = 15)
+	private Object bspecialties;
+	/**cdefwarehouse*/
+	@Excel(name = "cdefwarehouse", width = 15)
+	private String cdefwarehouse;
+	/**ihighprice*/
+	@Excel(name = "ihighprice", width = 15)
+	private Float ihighprice;
+	/**iexpsalerate*/
+	@Excel(name = "iexpsalerate", width = 15)
+	private Float iexpsalerate;
+	/**cpricegroup*/
+	@Excel(name = "cpricegroup", width = 15)
+	private String cpricegroup;
+	/**coffergrade*/
+	@Excel(name = "coffergrade", width = 15)
+	private String coffergrade;
+	/**iofferrate*/
+	@Excel(name = "iofferrate", width = 15)
+	private Float iofferrate;
+	/**cmonth*/
+	@Excel(name = "cmonth", width = 15)
+	private String cmonth;
+	/**iadvancedate*/
+	@Excel(name = "iadvancedate", width = 15)
+	private Integer iadvancedate;
+	/**ccurrencyname*/
+	@Excel(name = "ccurrencyname", width = 15)
+	private String ccurrencyname;
+	/**cproduceaddress*/
+	@Excel(name = "cproduceaddress", width = 15)
+	private String cproduceaddress;
+	/**cproducenation*/
+	@Excel(name = "cproducenation", width = 15)
+	private String cproducenation;
+	/**cregisterno*/
+	@Excel(name = "cregisterno", width = 15)
+	private String cregisterno;
+	/**centerno*/
+	@Excel(name = "centerno", width = 15)
+	private String centerno;
+	/**cpackingtype*/
+	@Excel(name = "cpackingtype", width = 15)
+	private String cpackingtype;
+	/**cenglishname*/
+	@Excel(name = "cenglishname", width = 15)
+	private String cenglishname;
+	/**bpropertycheck*/
+	@Excel(name = "bpropertycheck", width = 15)
+	private Object bpropertycheck;
+	/**cpreparationtype*/
+	@Excel(name = "cpreparationtype", width = 15)
+	private String cpreparationtype;
+	/**ccommodity*/
+	@Excel(name = "ccommodity", width = 15)
+	private String ccommodity;
+	/**irecipebatch*/
+	@Excel(name = "irecipebatch", width = 15)
+	private Integer irecipebatch;
+	/**cnotpatentname*/
+	@Excel(name = "cnotpatentname", width = 15)
+	private String cnotpatentname;
+//	/**pubufts*/
+//	private Date pubufts;
+	/**bpromotsales*/
+	@Excel(name = "bpromotsales", width = 15)
+	private Object bpromotsales;
+	/**iplanpolicy*/
+	@Excel(name = "iplanpolicy", width = 15)
+	private Integer iplanpolicy;
+	/**iropmethod*/
+	@Excel(name = "iropmethod", width = 15)
+	private Integer iropmethod;
+	/**ibatchrule*/
+	@Excel(name = "ibatchrule", width = 15)
+	private Integer ibatchrule;
+	/**fbatchincrement*/
+	@Excel(name = "fbatchincrement", width = 15)
+	private Float fbatchincrement;
+	/**iassureprovidedays*/
+	@Excel(name = "iassureprovidedays", width = 15)
+	private Integer iassureprovidedays;
+	/**iteststyle*/
+	@Excel(name = "iteststyle", width = 15)
+	private Integer iteststyle;
+	/**idtmethod*/
+	@Excel(name = "idtmethod", width = 15)
+	private Integer idtmethod;
+	/**fdtrate*/
+	@Excel(name = "fdtrate", width = 15)
+	private Float fdtrate;
+	/**fdtnum*/
+	@Excel(name = "fdtnum", width = 15)
+	private Float fdtnum;
+	/**cdtunit*/
+	@Excel(name = "cdtunit", width = 15)
+	private String cdtunit;
+	/**idtstyle*/
+	@Excel(name = "idtstyle", width = 15)
+	private Integer idtstyle;
+	/**iqtmethod*/
+	@Excel(name = "iqtmethod", width = 15)
+	private Integer iqtmethod;
+	/**pictureguid*/
+	@Excel(name = "pictureguid", width = 15)
+	private Object pictureguid;
+	/**bplaninv*/
+	@Excel(name = "bplaninv", width = 15)
+	private Object bplaninv;
+	/**bproxyforeign*/
+	@Excel(name = "bproxyforeign", width = 15)
+	private Object bproxyforeign;
+	/**batomodel*/
+	@Excel(name = "batomodel", width = 15)
+	private Object batomodel;
+	/**bcheckitem*/
+	@Excel(name = "bcheckitem", width = 15)
+	private Object bcheckitem;
+	/**bptomodel*/
+	@Excel(name = "bptomodel", width = 15)
+	private Object bptomodel;
+	/**bequipment*/
+	@Excel(name = "bequipment", width = 15)
+	private Object bequipment;
+	/**cproductunit*/
+	@Excel(name = "cproductunit", width = 15)
+	private String cproductunit;
+	/**forderuplimit*/
+	@Excel(name = "forderuplimit", width = 15)
+	private Float forderuplimit;
+	/**cmassunit*/
+	@Excel(name = "cmassunit", width = 15)
+	private Integer cmassunit;
+	/**fretailprice*/
+	@Excel(name = "fretailprice", width = 15)
+	private Float fretailprice;
+	/**cinvdepcode*/
+	@Excel(name = "cinvdepcode", width = 15)
+	private String cinvdepcode;
+	/**ialteradvance*/
+	@Excel(name = "ialteradvance", width = 15)
+	private Integer ialteradvance;
+	/**falterbasenum*/
+	@Excel(name = "falterbasenum", width = 15)
+	private Float falterbasenum;
+	/**cplanmethod*/
+	@Excel(name = "cplanmethod", width = 15)
+	private String cplanmethod;
+	/**bmps*/
+	@Excel(name = "bmps", width = 15)
+	private Object bmps;
+	/**brop*/
+	@Excel(name = "brop", width = 15)
+	private Object brop;
+	/**breplan*/
+	@Excel(name = "breplan", width = 15)
+	private Object breplan;
+	/**csrpolicy*/
+	@Excel(name = "csrpolicy", width = 15)
+	private String csrpolicy;
+	/**bbillunite*/
+	@Excel(name = "bbillunite", width = 15)
+	private Object bbillunite;
+	/**isupplyday*/
+	@Excel(name = "isupplyday", width = 15)
+	private Integer isupplyday;
+	/**fsupplymulti*/
+	@Excel(name = "fsupplymulti", width = 15)
+	private Float fsupplymulti;
+	/**fminsupply*/
+	@Excel(name = "fminsupply", width = 15)
+	private Float fminsupply;
+	/**bcutmantissa*/
+	@Excel(name = "bcutmantissa", width = 15)
+	private Object bcutmantissa;
+	/**cinvpersoncode*/
+	@Excel(name = "cinvpersoncode", width = 15)
+	private String cinvpersoncode;
+	/**iinvtfid*/
+	@Excel(name = "iinvtfid", width = 15)
+	private Integer iinvtfid;
+	/**cengineerfigno*/
+	@Excel(name = "cengineerfigno", width = 15)
+	private String cengineerfigno;
+	/**bintotalcost*/
+	@Excel(name = "bintotalcost", width = 15)
+	private Object bintotalcost;
+	/**isupplytype*/
+	@Excel(name = "isupplytype", width = 15)
+	private Integer isupplytype;
+	/**bconfigfree1*/
+	@Excel(name = "bconfigfree1", width = 15)
+	private Object bconfigfree1;
+	/**bconfigfree2*/
+	@Excel(name = "bconfigfree2", width = 15)
+	private Object bconfigfree2;
+	/**bconfigfree3*/
+	@Excel(name = "bconfigfree3", width = 15)
+	private Object bconfigfree3;
+	/**bconfigfree4*/
+	@Excel(name = "bconfigfree4", width = 15)
+	private Object bconfigfree4;
+	/**bconfigfree5*/
+	@Excel(name = "bconfigfree5", width = 15)
+	private Object bconfigfree5;
+	/**bconfigfree6*/
+	@Excel(name = "bconfigfree6", width = 15)
+	private Object bconfigfree6;
+	/**bconfigfree7*/
+	@Excel(name = "bconfigfree7", width = 15)
+	private Object bconfigfree7;
+	/**bconfigfree8*/
+	@Excel(name = "bconfigfree8", width = 15)
+	private Object bconfigfree8;
+	/**bconfigfree9*/
+	@Excel(name = "bconfigfree9", width = 15)
+	private Object bconfigfree9;
+	/**bconfigfree10*/
+	@Excel(name = "bconfigfree10", width = 15)
+	private Object bconfigfree10;
+	/**idtlevel*/
+	@Excel(name = "idtlevel", width = 15)
+	private Integer idtlevel;
+	/**cdtaql*/
+	@Excel(name = "cdtaql", width = 15)
+	private String cdtaql;
+	/**bperioddt*/
+	@Excel(name = "bperioddt", width = 15)
+	private Object bperioddt;
+	/**cdtperiod*/
+	@Excel(name = "cdtperiod", width = 15)
+	private String cdtperiod;
+	/**ibigmonth*/
+	@Excel(name = "ibigmonth", width = 15)
+	private Integer ibigmonth;
+	/**ibigday*/
+	@Excel(name = "ibigday", width = 15)
+	private Integer ibigday;
+	/**ismallmonth*/
+	@Excel(name = "ismallmonth", width = 15)
+	private Integer ismallmonth;
+	/**ismallday*/
+	@Excel(name = "ismallday", width = 15)
+	private Integer ismallday;
+	/**boutinvdt*/
+	@Excel(name = "boutinvdt", width = 15)
+	private Object boutinvdt;
+	/**bbackinvdt*/
+	@Excel(name = "bbackinvdt", width = 15)
+	private Object bbackinvdt;
+	/**ienddtstyle*/
+	@Excel(name = "ienddtstyle", width = 15)
+	private Integer ienddtstyle;
+	/**bdtwarninv*/
+	@Excel(name = "bdtwarninv", width = 15)
+	private Object bdtwarninv;
+	/**fbacktaxrate*/
+	@Excel(name = "fbacktaxrate", width = 15)
+	private Float fbacktaxrate;
+	/**cciqcode*/
+	@Excel(name = "cciqcode", width = 15)
+	private String cciqcode;
+	/**cwgroupcode*/
+	@Excel(name = "cwgroupcode", width = 15)
+	private String cwgroupcode;
+	/**cwunit*/
+	@Excel(name = "cwunit", width = 15)
+	private String cwunit;
+	/**fgrossw*/
+	@Excel(name = "fgrossw", width = 15)
+	private Float fgrossw;
+	/**cvgroupcode*/
+	@Excel(name = "cvgroupcode", width = 15)
+	private String cvgroupcode;
+	/**cvunit*/
+	@Excel(name = "cvunit", width = 15)
+	private String cvunit;
+	/**flength*/
+	@Excel(name = "flength", width = 15)
+	private Float flength;
+	/**fwidth*/
+	@Excel(name = "fwidth", width = 15)
+	private Float fwidth;
+	/**fheight*/
+	@Excel(name = "fheight", width = 15)
+	private Float fheight;
+	/**idtucounter*/
+	@Excel(name = "idtucounter", width = 15)
+	private Integer idtucounter;
+	/**idtdcounter*/
+	@Excel(name = "idtdcounter", width = 15)
+	private Integer idtdcounter;
+	/**ibatchcounter*/
+	@Excel(name = "ibatchcounter", width = 15)
+	private Integer ibatchcounter;
+	/**cshopunit*/
+	@Excel(name = "cshopunit", width = 15)
+	private String cshopunit;
+	/**cpurpersoncode*/
+	@Excel(name = "cpurpersoncode", width = 15)
+	private String cpurpersoncode;
+	/**bimportmedicine*/
+	@Excel(name = "bimportmedicine", width = 15)
+	private Object bimportmedicine;
+	/**bfirstbusimedicine*/
+	@Excel(name = "bfirstbusimedicine", width = 15)
+	private Object bfirstbusimedicine;
+	/**bforeexpland*/
+	@Excel(name = "bforeexpland", width = 15)
+	private Object bforeexpland;
+	/**cinvplancode*/
+	@Excel(name = "cinvplancode", width = 15)
+	private String cinvplancode;
+	/**fconvertrate*/
+	@Excel(name = "fconvertrate", width = 15)
+	private Float fconvertrate;
+	/**dreplacedate*/
+	@Excel(name = "dreplacedate", 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 dreplacedate;
+	/**binvmodel*/
+	@Excel(name = "binvmodel", width = 15)
+	private Object binvmodel;
+	/**bkccutmantissa*/
+	@Excel(name = "bkccutmantissa", width = 15)
+	private Object bkccutmantissa;
+	/**breceiptbydt*/
+	@Excel(name = "breceiptbydt", width = 15)
+	private Object breceiptbydt;
+	/**iimptaxrate*/
+	@Excel(name = "iimptaxrate", width = 15)
+	private Float iimptaxrate;
+	/**iexptaxrate*/
+	@Excel(name = "iexptaxrate", width = 15)
+	private Float iexptaxrate;
+	/**bexpsale*/
+	@Excel(name = "bexpsale", width = 15)
+	private Object bexpsale;
+	/**idrawbatch*/
+	@Excel(name = "idrawbatch", width = 15)
+	private Float idrawbatch;
+	/**bcheckbsatp*/
+	@Excel(name = "bcheckbsatp", width = 15)
+	private Object bcheckbsatp;
+	/**cinvprojectcode*/
+	@Excel(name = "cinvprojectcode", width = 15)
+	private String cinvprojectcode;
+	/**itestrule*/
+	@Excel(name = "itestrule", width = 15)
+	private Integer itestrule;
+	/**crulecode*/
+	@Excel(name = "crulecode", width = 15)
+	private String crulecode;
+	/**bcheckfree1*/
+	@Excel(name = "bcheckfree1", width = 15)
+	private Object bcheckfree1;
+	/**bcheckfree2*/
+	@Excel(name = "bcheckfree2", width = 15)
+	private Object bcheckfree2;
+	/**bcheckfree3*/
+	@Excel(name = "bcheckfree3", width = 15)
+	private Object bcheckfree3;
+	/**bcheckfree4*/
+	@Excel(name = "bcheckfree4", width = 15)
+	private Object bcheckfree4;
+	/**bcheckfree5*/
+	@Excel(name = "bcheckfree5", width = 15)
+	private Object bcheckfree5;
+	/**bcheckfree6*/
+	@Excel(name = "bcheckfree6", width = 15)
+	private Object bcheckfree6;
+	/**bcheckfree7*/
+	@Excel(name = "bcheckfree7", width = 15)
+	private Object bcheckfree7;
+	/**bcheckfree8*/
+	@Excel(name = "bcheckfree8", width = 15)
+	private Object bcheckfree8;
+	/**bcheckfree9*/
+	@Excel(name = "bcheckfree9", width = 15)
+	private Object bcheckfree9;
+	/**bcheckfree10*/
+	@Excel(name = "bcheckfree10", width = 15)
+	private Object bcheckfree10;
+	/**bbommain*/
+	@Excel(name = "bbommain", width = 15)
+	private Object bbommain;
+	/**bbomsub*/
+	@Excel(name = "bbomsub", width = 15)
+	private Object bbomsub;
+	/**bproductbill*/
+	@Excel(name = "bproductbill", width = 15)
+	private Object bproductbill;
+	/**icheckatp*/
+	@Excel(name = "icheckatp", width = 15)
+	private Integer icheckatp;
+	/**iinvatpid*/
+	@Excel(name = "iinvatpid", width = 15)
+	private Integer iinvatpid;
+	/**iplantfday*/
+	@Excel(name = "iplantfday", width = 15)
+	private Integer iplantfday;
+	/**ioverlapday*/
+	@Excel(name = "ioverlapday", width = 15)
+	private Integer ioverlapday;
+	/**bpiece*/
+	@Excel(name = "bpiece", width = 15)
+	private Object bpiece;
+	/**bsrvitem*/
+	@Excel(name = "bsrvitem", width = 15)
+	private Object bsrvitem;
+	/**bsrvfittings*/
+	@Excel(name = "bsrvfittings", width = 15)
+	private Object bsrvfittings;
+	/**fmaxsupply*/
+	@Excel(name = "fmaxsupply", width = 15)
+	private Float fmaxsupply;
+	/**fminsplit*/
+	@Excel(name = "fminsplit", width = 15)
+	private Float fminsplit;
+	/**bspecialorder*/
+	@Excel(name = "bspecialorder", width = 15)
+	private Object bspecialorder;
+	/**btracksalebill*/
+	@Excel(name = "btracksalebill", width = 15)
+	private Object btracksalebill;
+	/**cinvmnemcode*/
+	@Excel(name = "cinvmnemcode", width = 15)
+	private String cinvmnemcode;
+	/**iplandefault*/
+	@Excel(name = "iplandefault", width = 15)
+	private Integer iplandefault;
+	/**ipfbatchqty*/
+	@Excel(name = "ipfbatchqty", width = 15)
+	private Float ipfbatchqty;
+	/**iallocateprintdgt*/
+	@Excel(name = "iallocateprintdgt", width = 15)
+	private Integer iallocateprintdgt;
+	/**bcheckbatch*/
+	@Excel(name = "bcheckbatch", width = 15)
+	private Object bcheckbatch;
+	/**bmngoldpart*/
+	@Excel(name = "bmngoldpart", width = 15)
+	private Object bmngoldpart;
+	/**ioldpartmngrule*/
+	@Excel(name = "ioldpartmngrule", width = 15)
+	private Integer ioldpartmngrule;
+	/**cretaildefreturnwh*/
+	@Excel(name = "cretaildefreturnwh", width = 15)
+	private String cretaildefreturnwh;
+}

src/main/java/org/jeecg/modules/fbsInventory/mapper/FbsInventoryMapper.java

@@ -0,0 +1,24 @@
+package org.jeecg.modules.fbsInventory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsInventory.entity.FbsInventory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 存库档案
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface FbsInventoryMapper extends BaseMapper<FbsInventory> {
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据生产订单id查询产品
+    * @Date 2020/10/16 18:45
+    * @Param [moId]
+    * @return java.util.List<org.jeecg.modules.fbsInventory.entity.FbsInventory>
+    */
+    List<FbsInventory> getInventoryGetByOrderId(@Param("moId")String moId);
+}

src/main/java/org/jeecg/modules/fbsInventory/mapper/xml/FbsInventoryMapper.xml

@@ -0,0 +1,13 @@
+<?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.fbsInventory.mapper.FbsInventoryMapper">
+    <select id="getInventoryGetByOrderId" resultType="org.jeecg.modules.fbsInventory.entity.FbsInventory" >
+        SELECT
+        i.cInvCode as cinvcode,i.cInvName as cinvname
+        FROM
+        mom_orderdetail m
+        LEFT JOIN Inventory i ON m.InvCode = i.cInvCode
+        WHERE
+        m.MoId = #{moId}
+    </select>
+</mapper>

src/main/java/org/jeecg/modules/fbsInventory/service/IFbsInventoryService.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.fbsInventory.service;
+
+import org.jeecg.modules.fbsInventory.entity.FbsInventory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * @Description: 存库档案
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface IFbsInventoryService extends IService<FbsInventory> {
+
+    /**
+    * @Author chenchuang
+    * @Description //TODO 根据生产订单id查询产品
+    * @Date 2020/10/16 18:47
+    * @Param [moId]
+    * @return java.util.List<org.jeecg.modules.fbsInventory.entity.FbsInventory>
+    */
+    List<FbsInventory> getInventoryGetByOrderId(String moId);
+
+}

src/main/java/org/jeecg/modules/fbsInventory/service/impl/FbsInventoryServiceImpl.java

@@ -0,0 +1,31 @@
+package org.jeecg.modules.fbsInventory.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.jeecg.modules.fbsInventory.entity.FbsInventory;
+import org.jeecg.modules.fbsInventory.mapper.FbsInventoryMapper;
+import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+
+/**
+ * @Description: 存库档案
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+@Service
+@DS("multi-datasource1")
+public class FbsInventoryServiceImpl extends ServiceImpl<FbsInventoryMapper, FbsInventory> implements IFbsInventoryService {
+
+    @Autowired
+    FbsInventoryMapper fbsInventoryMapper;
+
+    @Override
+    public List<FbsInventory> getInventoryGetByOrderId(String moId) {
+        return fbsInventoryMapper.getInventoryGetByOrderId(moId);
+    }
+}

src/main/java/org/jeecg/modules/fbsInventory/vue/FbsInventoryList.vue

@@ -0,0 +1,1464 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="cinvcode">
+              <a-input placeholder="请输入cinvcode" v-model="queryParam.cinvcode"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="cinvaddcode">
+              <a-input placeholder="请输入cinvaddcode" v-model="queryParam.cinvaddcode"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="cinvname">
+              <a-input placeholder="请输入cinvname" v-model="queryParam.cinvname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="cinvstd">
+              <a-input placeholder="请输入cinvstd" v-model="queryParam.cinvstd"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="cinvccode">
+              <a-input placeholder="请输入cinvccode" v-model="queryParam.cinvccode"></a-input>
+            </a-form-item>
+          </a-col>
+        </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <fbsInventory-modal ref="modalForm" @ok="modalFormOk"></fbsInventory-modal>
+  </a-card>
+</template>
+
+<script>
+  import FbsInventoryModal from './modules/FbsInventoryModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "FbsInventoryList",
+    mixins:[JeecgListMixin],
+    components: {
+      FbsInventoryModal
+    },
+    data () {
+      return {
+        description: '存库档案管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'cinvcode',
+            align:"center",
+            dataIndex: 'cinvcode'
+           },
+		   {
+            title: 'cinvaddcode',
+            align:"center",
+            dataIndex: 'cinvaddcode'
+           },
+		   {
+            title: 'cinvname',
+            align:"center",
+            dataIndex: 'cinvname'
+           },
+		   {
+            title: 'cinvstd',
+            align:"center",
+            dataIndex: 'cinvstd'
+           },
+		   {
+            title: 'cinvccode',
+            align:"center",
+            dataIndex: 'cinvccode'
+           },
+		   {
+            title: 'cvencode',
+            align:"center",
+            dataIndex: 'cvencode'
+           },
+		   {
+            title: 'creplaceitem',
+            align:"center",
+            dataIndex: 'creplaceitem'
+           },
+		   {
+            title: 'cposition',
+            align:"center",
+            dataIndex: 'cposition'
+           },
+		   {
+            title: 'bsale',
+            align:"center",
+            dataIndex: 'bsale'
+           },
+		   {
+            title: 'bpurchase',
+            align:"center",
+            dataIndex: 'bpurchase'
+           },
+		   {
+            title: 'bself',
+            align:"center",
+            dataIndex: 'bself'
+           },
+		   {
+            title: 'bcomsume',
+            align:"center",
+            dataIndex: 'bcomsume'
+           },
+		   {
+            title: 'bproducing',
+            align:"center",
+            dataIndex: 'bproducing'
+           },
+		   {
+            title: 'bservice',
+            align:"center",
+            dataIndex: 'bservice'
+           },
+		   {
+            title: 'baccessary',
+            align:"center",
+            dataIndex: 'baccessary'
+           },
+		   {
+            title: 'itaxrate',
+            align:"center",
+            dataIndex: 'itaxrate'
+           },
+		   {
+            title: 'iinvweight',
+            align:"center",
+            dataIndex: 'iinvweight'
+           },
+		   {
+            title: 'ivolume',
+            align:"center",
+            dataIndex: 'ivolume'
+           },
+		   {
+            title: 'iinvrcost',
+            align:"center",
+            dataIndex: 'iinvrcost'
+           },
+		   {
+            title: 'iinvsprice',
+            align:"center",
+            dataIndex: 'iinvsprice'
+           },
+		   {
+            title: 'iinvscost',
+            align:"center",
+            dataIndex: 'iinvscost'
+           },
+		   {
+            title: 'iinvlscost',
+            align:"center",
+            dataIndex: 'iinvlscost'
+           },
+		   {
+            title: 'iinvncost',
+            align:"center",
+            dataIndex: 'iinvncost'
+           },
+		   {
+            title: 'iinvadvance',
+            align:"center",
+            dataIndex: 'iinvadvance'
+           },
+		   {
+            title: 'iinvbatch',
+            align:"center",
+            dataIndex: 'iinvbatch'
+           },
+		   {
+            title: 'isafenum',
+            align:"center",
+            dataIndex: 'isafenum'
+           },
+		   {
+            title: 'itopsum',
+            align:"center",
+            dataIndex: 'itopsum'
+           },
+		   {
+            title: 'ilowsum',
+            align:"center",
+            dataIndex: 'ilowsum'
+           },
+		   {
+            title: 'ioverstock',
+            align:"center",
+            dataIndex: 'ioverstock'
+           },
+		   {
+            title: 'cinvabc',
+            align:"center",
+            dataIndex: 'cinvabc'
+           },
+		   {
+            title: 'binvquality',
+            align:"center",
+            dataIndex: 'binvquality'
+           },
+		   {
+            title: 'binvbatch',
+            align:"center",
+            dataIndex: 'binvbatch'
+           },
+		   {
+            title: 'binventrust',
+            align:"center",
+            dataIndex: 'binventrust'
+           },
+		   {
+            title: 'binvoverstock',
+            align:"center",
+            dataIndex: 'binvoverstock'
+           },
+		   {
+            title: 'dsdate',
+            align:"center",
+            dataIndex: 'dsdate'
+           },
+		   {
+            title: 'dedate',
+            align:"center",
+            dataIndex: 'dedate'
+           },
+		   {
+            title: 'bfree1',
+            align:"center",
+            dataIndex: 'bfree1'
+           },
+		   {
+            title: 'bfree2',
+            align:"center",
+            dataIndex: 'bfree2'
+           },
+		   {
+            title: 'cinvdefine1',
+            align:"center",
+            dataIndex: 'cinvdefine1'
+           },
+		   {
+            title: 'cinvdefine2',
+            align:"center",
+            dataIndex: 'cinvdefine2'
+           },
+		   {
+            title: 'cinvdefine3',
+            align:"center",
+            dataIndex: 'cinvdefine3'
+           },
+		   {
+            title: 'iId',
+            align:"center",
+            dataIndex: 'iId'
+           },
+		   {
+            title: 'binvtype',
+            align:"center",
+            dataIndex: 'binvtype'
+           },
+		   {
+            title: 'iinvmpcost',
+            align:"center",
+            dataIndex: 'iinvmpcost'
+           },
+		   {
+            title: 'cquality',
+            align:"center",
+            dataIndex: 'cquality'
+           },
+		   {
+            title: 'iinvsalecost',
+            align:"center",
+            dataIndex: 'iinvsalecost'
+           },
+		   {
+            title: 'iinvscost1',
+            align:"center",
+            dataIndex: 'iinvscost1'
+           },
+		   {
+            title: 'iinvscost2',
+            align:"center",
+            dataIndex: 'iinvscost2'
+           },
+		   {
+            title: 'iinvscost3',
+            align:"center",
+            dataIndex: 'iinvscost3'
+           },
+		   {
+            title: 'bfree3',
+            align:"center",
+            dataIndex: 'bfree3'
+           },
+		   {
+            title: 'bfree4',
+            align:"center",
+            dataIndex: 'bfree4'
+           },
+		   {
+            title: 'bfree5',
+            align:"center",
+            dataIndex: 'bfree5'
+           },
+		   {
+            title: 'bfree6',
+            align:"center",
+            dataIndex: 'bfree6'
+           },
+		   {
+            title: 'bfree7',
+            align:"center",
+            dataIndex: 'bfree7'
+           },
+		   {
+            title: 'bfree8',
+            align:"center",
+            dataIndex: 'bfree8'
+           },
+		   {
+            title: 'bfree9',
+            align:"center",
+            dataIndex: 'bfree9'
+           },
+		   {
+            title: 'bfree10',
+            align:"center",
+            dataIndex: 'bfree10'
+           },
+		   {
+            title: 'ccreateperson',
+            align:"center",
+            dataIndex: 'ccreateperson'
+           },
+		   {
+            title: 'cmodifyperson',
+            align:"center",
+            dataIndex: 'cmodifyperson'
+           },
+		   {
+            title: 'dmodifydate',
+            align:"center",
+            dataIndex: 'dmodifydate'
+           },
+		   {
+            title: 'fsubscribepoint',
+            align:"center",
+            dataIndex: 'fsubscribepoint'
+           },
+		   {
+            title: 'fvagquantity',
+            align:"center",
+            dataIndex: 'fvagquantity'
+           },
+		   {
+            title: 'cvaluetype',
+            align:"center",
+            dataIndex: 'cvaluetype'
+           },
+		   {
+            title: 'bfixexch',
+            align:"center",
+            dataIndex: 'bfixexch'
+           },
+		   {
+            title: 'foutexcess',
+            align:"center",
+            dataIndex: 'foutexcess'
+           },
+		   {
+            title: 'finexcess',
+            align:"center",
+            dataIndex: 'finexcess'
+           },
+		   {
+            title: 'imassdate',
+            align:"center",
+            dataIndex: 'imassdate'
+           },
+		   {
+            title: 'iwarndays',
+            align:"center",
+            dataIndex: 'iwarndays'
+           },
+		   {
+            title: 'fexpensesexch',
+            align:"center",
+            dataIndex: 'fexpensesexch'
+           },
+		   {
+            title: 'btrack',
+            align:"center",
+            dataIndex: 'btrack'
+           },
+		   {
+            title: 'bserial',
+            align:"center",
+            dataIndex: 'bserial'
+           },
+		   {
+            title: 'bbarcode',
+            align:"center",
+            dataIndex: 'bbarcode'
+           },
+		   {
+            title: 'iid',
+            align:"center",
+            dataIndex: 'iid'
+           },
+		   {
+            title: 'cbarcode',
+            align:"center",
+            dataIndex: 'cbarcode'
+           },
+		   {
+            title: 'cinvdefine4',
+            align:"center",
+            dataIndex: 'cinvdefine4'
+           },
+		   {
+            title: 'cinvdefine5',
+            align:"center",
+            dataIndex: 'cinvdefine5'
+           },
+		   {
+            title: 'cinvdefine6',
+            align:"center",
+            dataIndex: 'cinvdefine6'
+           },
+		   {
+            title: 'cinvdefine7',
+            align:"center",
+            dataIndex: 'cinvdefine7'
+           },
+		   {
+            title: 'cinvdefine8',
+            align:"center",
+            dataIndex: 'cinvdefine8'
+           },
+		   {
+            title: 'cinvdefine9',
+            align:"center",
+            dataIndex: 'cinvdefine9'
+           },
+		   {
+            title: 'cinvdefine10',
+            align:"center",
+            dataIndex: 'cinvdefine10'
+           },
+		   {
+            title: 'cinvdefine11',
+            align:"center",
+            dataIndex: 'cinvdefine11'
+           },
+		   {
+            title: 'cinvdefine12',
+            align:"center",
+            dataIndex: 'cinvdefine12'
+           },
+		   {
+            title: 'cinvdefine13',
+            align:"center",
+            dataIndex: 'cinvdefine13'
+           },
+		   {
+            title: 'cinvdefine14',
+            align:"center",
+            dataIndex: 'cinvdefine14'
+           },
+		   {
+            title: 'cinvdefine15',
+            align:"center",
+            dataIndex: 'cinvdefine15'
+           },
+		   {
+            title: 'cinvdefine16',
+            align:"center",
+            dataIndex: 'cinvdefine16'
+           },
+		   {
+            title: 'igrouptype',
+            align:"center",
+            dataIndex: 'igrouptype'
+           },
+		   {
+            title: 'cgroupcode',
+            align:"center",
+            dataIndex: 'cgroupcode'
+           },
+		   {
+            title: 'ccomunitcode',
+            align:"center",
+            dataIndex: 'ccomunitcode'
+           },
+		   {
+            title: 'casscomunitcode',
+            align:"center",
+            dataIndex: 'casscomunitcode'
+           },
+		   {
+            title: 'csacomunitcode',
+            align:"center",
+            dataIndex: 'csacomunitcode'
+           },
+		   {
+            title: 'cpucomunitcode',
+            align:"center",
+            dataIndex: 'cpucomunitcode'
+           },
+		   {
+            title: 'cstcomunitcode',
+            align:"center",
+            dataIndex: 'cstcomunitcode'
+           },
+		   {
+            title: 'ccacomunitcode',
+            align:"center",
+            dataIndex: 'ccacomunitcode'
+           },
+		   {
+            title: 'cfrequency',
+            align:"center",
+            dataIndex: 'cfrequency'
+           },
+		   {
+            title: 'ifrequency',
+            align:"center",
+            dataIndex: 'ifrequency'
+           },
+		   {
+            title: 'idays',
+            align:"center",
+            dataIndex: 'idays'
+           },
+		   {
+            title: 'dlastdate',
+            align:"center",
+            dataIndex: 'dlastdate'
+           },
+		   {
+            title: 'iwastage',
+            align:"center",
+            dataIndex: 'iwastage'
+           },
+		   {
+            title: 'bsolitude',
+            align:"center",
+            dataIndex: 'bsolitude'
+           },
+		   {
+            title: 'centerprise',
+            align:"center",
+            dataIndex: 'centerprise'
+           },
+		   {
+            title: 'caddress',
+            align:"center",
+            dataIndex: 'caddress'
+           },
+		   {
+            title: 'cfile',
+            align:"center",
+            dataIndex: 'cfile'
+           },
+		   {
+            title: 'clabel',
+            align:"center",
+            dataIndex: 'clabel'
+           },
+		   {
+            title: 'ccheckout',
+            align:"center",
+            dataIndex: 'ccheckout'
+           },
+		   {
+            title: 'clicence',
+            align:"center",
+            dataIndex: 'clicence'
+           },
+		   {
+            title: 'bspecialties',
+            align:"center",
+            dataIndex: 'bspecialties'
+           },
+		   {
+            title: 'cdefwarehouse',
+            align:"center",
+            dataIndex: 'cdefwarehouse'
+           },
+		   {
+            title: 'ihighprice',
+            align:"center",
+            dataIndex: 'ihighprice'
+           },
+		   {
+            title: 'iexpsalerate',
+            align:"center",
+            dataIndex: 'iexpsalerate'
+           },
+		   {
+            title: 'cpricegroup',
+            align:"center",
+            dataIndex: 'cpricegroup'
+           },
+		   {
+            title: 'coffergrade',
+            align:"center",
+            dataIndex: 'coffergrade'
+           },
+		   {
+            title: 'iofferrate',
+            align:"center",
+            dataIndex: 'iofferrate'
+           },
+		   {
+            title: 'cmonth',
+            align:"center",
+            dataIndex: 'cmonth'
+           },
+		   {
+            title: 'iadvancedate',
+            align:"center",
+            dataIndex: 'iadvancedate'
+           },
+		   {
+            title: 'ccurrencyname',
+            align:"center",
+            dataIndex: 'ccurrencyname'
+           },
+		   {
+            title: 'cproduceaddress',
+            align:"center",
+            dataIndex: 'cproduceaddress'
+           },
+		   {
+            title: 'cproducenation',
+            align:"center",
+            dataIndex: 'cproducenation'
+           },
+		   {
+            title: 'cregisterno',
+            align:"center",
+            dataIndex: 'cregisterno'
+           },
+		   {
+            title: 'centerno',
+            align:"center",
+            dataIndex: 'centerno'
+           },
+		   {
+            title: 'cpackingtype',
+            align:"center",
+            dataIndex: 'cpackingtype'
+           },
+		   {
+            title: 'cenglishname',
+            align:"center",
+            dataIndex: 'cenglishname'
+           },
+		   {
+            title: 'bpropertycheck',
+            align:"center",
+            dataIndex: 'bpropertycheck'
+           },
+		   {
+            title: 'cpreparationtype',
+            align:"center",
+            dataIndex: 'cpreparationtype'
+           },
+		   {
+            title: 'ccommodity',
+            align:"center",
+            dataIndex: 'ccommodity'
+           },
+		   {
+            title: 'irecipebatch',
+            align:"center",
+            dataIndex: 'irecipebatch'
+           },
+		   {
+            title: 'cnotpatentname',
+            align:"center",
+            dataIndex: 'cnotpatentname'
+           },
+		   {
+            title: 'pubufts',
+            align:"center",
+            dataIndex: 'pubufts'
+           },
+		   {
+            title: 'bpromotsales',
+            align:"center",
+            dataIndex: 'bpromotsales'
+           },
+		   {
+            title: 'iplanpolicy',
+            align:"center",
+            dataIndex: 'iplanpolicy'
+           },
+		   {
+            title: 'iropmethod',
+            align:"center",
+            dataIndex: 'iropmethod'
+           },
+		   {
+            title: 'ibatchrule',
+            align:"center",
+            dataIndex: 'ibatchrule'
+           },
+		   {
+            title: 'fbatchincrement',
+            align:"center",
+            dataIndex: 'fbatchincrement'
+           },
+		   {
+            title: 'iassureprovidedays',
+            align:"center",
+            dataIndex: 'iassureprovidedays'
+           },
+		   {
+            title: 'iteststyle',
+            align:"center",
+            dataIndex: 'iteststyle'
+           },
+		   {
+            title: 'idtmethod',
+            align:"center",
+            dataIndex: 'idtmethod'
+           },
+		   {
+            title: 'fdtrate',
+            align:"center",
+            dataIndex: 'fdtrate'
+           },
+		   {
+            title: 'fdtnum',
+            align:"center",
+            dataIndex: 'fdtnum'
+           },
+		   {
+            title: 'cdtunit',
+            align:"center",
+            dataIndex: 'cdtunit'
+           },
+		   {
+            title: 'idtstyle',
+            align:"center",
+            dataIndex: 'idtstyle'
+           },
+		   {
+            title: 'iqtmethod',
+            align:"center",
+            dataIndex: 'iqtmethod'
+           },
+		   {
+            title: 'pictureguid',
+            align:"center",
+            dataIndex: 'pictureguid'
+           },
+		   {
+            title: 'bplaninv',
+            align:"center",
+            dataIndex: 'bplaninv'
+           },
+		   {
+            title: 'bproxyforeign',
+            align:"center",
+            dataIndex: 'bproxyforeign'
+           },
+		   {
+            title: 'batomodel',
+            align:"center",
+            dataIndex: 'batomodel'
+           },
+		   {
+            title: 'bcheckitem',
+            align:"center",
+            dataIndex: 'bcheckitem'
+           },
+		   {
+            title: 'bptomodel',
+            align:"center",
+            dataIndex: 'bptomodel'
+           },
+		   {
+            title: 'bequipment',
+            align:"center",
+            dataIndex: 'bequipment'
+           },
+		   {
+            title: 'cproductunit',
+            align:"center",
+            dataIndex: 'cproductunit'
+           },
+		   {
+            title: 'forderuplimit',
+            align:"center",
+            dataIndex: 'forderuplimit'
+           },
+		   {
+            title: 'cmassunit',
+            align:"center",
+            dataIndex: 'cmassunit'
+           },
+		   {
+            title: 'fretailprice',
+            align:"center",
+            dataIndex: 'fretailprice'
+           },
+		   {
+            title: 'cinvdepcode',
+            align:"center",
+            dataIndex: 'cinvdepcode'
+           },
+		   {
+            title: 'ialteradvance',
+            align:"center",
+            dataIndex: 'ialteradvance'
+           },
+		   {
+            title: 'falterbasenum',
+            align:"center",
+            dataIndex: 'falterbasenum'
+           },
+		   {
+            title: 'cplanmethod',
+            align:"center",
+            dataIndex: 'cplanmethod'
+           },
+		   {
+            title: 'bmps',
+            align:"center",
+            dataIndex: 'bmps'
+           },
+		   {
+            title: 'brop',
+            align:"center",
+            dataIndex: 'brop'
+           },
+		   {
+            title: 'breplan',
+            align:"center",
+            dataIndex: 'breplan'
+           },
+		   {
+            title: 'csrpolicy',
+            align:"center",
+            dataIndex: 'csrpolicy'
+           },
+		   {
+            title: 'bbillunite',
+            align:"center",
+            dataIndex: 'bbillunite'
+           },
+		   {
+            title: 'isupplyday',
+            align:"center",
+            dataIndex: 'isupplyday'
+           },
+		   {
+            title: 'fsupplymulti',
+            align:"center",
+            dataIndex: 'fsupplymulti'
+           },
+		   {
+            title: 'fminsupply',
+            align:"center",
+            dataIndex: 'fminsupply'
+           },
+		   {
+            title: 'bcutmantissa',
+            align:"center",
+            dataIndex: 'bcutmantissa'
+           },
+		   {
+            title: 'cinvpersoncode',
+            align:"center",
+            dataIndex: 'cinvpersoncode'
+           },
+		   {
+            title: 'iinvtfid',
+            align:"center",
+            dataIndex: 'iinvtfid'
+           },
+		   {
+            title: 'cengineerfigno',
+            align:"center",
+            dataIndex: 'cengineerfigno'
+           },
+		   {
+            title: 'bintotalcost',
+            align:"center",
+            dataIndex: 'bintotalcost'
+           },
+		   {
+            title: 'isupplytype',
+            align:"center",
+            dataIndex: 'isupplytype'
+           },
+		   {
+            title: 'bconfigfree1',
+            align:"center",
+            dataIndex: 'bconfigfree1'
+           },
+		   {
+            title: 'bconfigfree2',
+            align:"center",
+            dataIndex: 'bconfigfree2'
+           },
+		   {
+            title: 'bconfigfree3',
+            align:"center",
+            dataIndex: 'bconfigfree3'
+           },
+		   {
+            title: 'bconfigfree4',
+            align:"center",
+            dataIndex: 'bconfigfree4'
+           },
+		   {
+            title: 'bconfigfree5',
+            align:"center",
+            dataIndex: 'bconfigfree5'
+           },
+		   {
+            title: 'bconfigfree6',
+            align:"center",
+            dataIndex: 'bconfigfree6'
+           },
+		   {
+            title: 'bconfigfree7',
+            align:"center",
+            dataIndex: 'bconfigfree7'
+           },
+		   {
+            title: 'bconfigfree8',
+            align:"center",
+            dataIndex: 'bconfigfree8'
+           },
+		   {
+            title: 'bconfigfree9',
+            align:"center",
+            dataIndex: 'bconfigfree9'
+           },
+		   {
+            title: 'bconfigfree10',
+            align:"center",
+            dataIndex: 'bconfigfree10'
+           },
+		   {
+            title: 'idtlevel',
+            align:"center",
+            dataIndex: 'idtlevel'
+           },
+		   {
+            title: 'cdtaql',
+            align:"center",
+            dataIndex: 'cdtaql'
+           },
+		   {
+            title: 'bperioddt',
+            align:"center",
+            dataIndex: 'bperioddt'
+           },
+		   {
+            title: 'cdtperiod',
+            align:"center",
+            dataIndex: 'cdtperiod'
+           },
+		   {
+            title: 'ibigmonth',
+            align:"center",
+            dataIndex: 'ibigmonth'
+           },
+		   {
+            title: 'ibigday',
+            align:"center",
+            dataIndex: 'ibigday'
+           },
+		   {
+            title: 'ismallmonth',
+            align:"center",
+            dataIndex: 'ismallmonth'
+           },
+		   {
+            title: 'ismallday',
+            align:"center",
+            dataIndex: 'ismallday'
+           },
+		   {
+            title: 'boutinvdt',
+            align:"center",
+            dataIndex: 'boutinvdt'
+           },
+		   {
+            title: 'bbackinvdt',
+            align:"center",
+            dataIndex: 'bbackinvdt'
+           },
+		   {
+            title: 'ienddtstyle',
+            align:"center",
+            dataIndex: 'ienddtstyle'
+           },
+		   {
+            title: 'bdtwarninv',
+            align:"center",
+            dataIndex: 'bdtwarninv'
+           },
+		   {
+            title: 'fbacktaxrate',
+            align:"center",
+            dataIndex: 'fbacktaxrate'
+           },
+		   {
+            title: 'cciqcode',
+            align:"center",
+            dataIndex: 'cciqcode'
+           },
+		   {
+            title: 'cwgroupcode',
+            align:"center",
+            dataIndex: 'cwgroupcode'
+           },
+		   {
+            title: 'cwunit',
+            align:"center",
+            dataIndex: 'cwunit'
+           },
+		   {
+            title: 'fgrossw',
+            align:"center",
+            dataIndex: 'fgrossw'
+           },
+		   {
+            title: 'cvgroupcode',
+            align:"center",
+            dataIndex: 'cvgroupcode'
+           },
+		   {
+            title: 'cvunit',
+            align:"center",
+            dataIndex: 'cvunit'
+           },
+		   {
+            title: 'flength',
+            align:"center",
+            dataIndex: 'flength'
+           },
+		   {
+            title: 'fwidth',
+            align:"center",
+            dataIndex: 'fwidth'
+           },
+		   {
+            title: 'fheight',
+            align:"center",
+            dataIndex: 'fheight'
+           },
+		   {
+            title: 'idtucounter',
+            align:"center",
+            dataIndex: 'idtucounter'
+           },
+		   {
+            title: 'idtdcounter',
+            align:"center",
+            dataIndex: 'idtdcounter'
+           },
+		   {
+            title: 'ibatchcounter',
+            align:"center",
+            dataIndex: 'ibatchcounter'
+           },
+		   {
+            title: 'cshopunit',
+            align:"center",
+            dataIndex: 'cshopunit'
+           },
+		   {
+            title: 'cpurpersoncode',
+            align:"center",
+            dataIndex: 'cpurpersoncode'
+           },
+		   {
+            title: 'bimportmedicine',
+            align:"center",
+            dataIndex: 'bimportmedicine'
+           },
+		   {
+            title: 'bfirstbusimedicine',
+            align:"center",
+            dataIndex: 'bfirstbusimedicine'
+           },
+		   {
+            title: 'bforeexpland',
+            align:"center",
+            dataIndex: 'bforeexpland'
+           },
+		   {
+            title: 'cinvplancode',
+            align:"center",
+            dataIndex: 'cinvplancode'
+           },
+		   {
+            title: 'fconvertrate',
+            align:"center",
+            dataIndex: 'fconvertrate'
+           },
+		   {
+            title: 'dreplacedate',
+            align:"center",
+            dataIndex: 'dreplacedate'
+           },
+		   {
+            title: 'binvmodel',
+            align:"center",
+            dataIndex: 'binvmodel'
+           },
+		   {
+            title: 'bkccutmantissa',
+            align:"center",
+            dataIndex: 'bkccutmantissa'
+           },
+		   {
+            title: 'breceiptbydt',
+            align:"center",
+            dataIndex: 'breceiptbydt'
+           },
+		   {
+            title: 'iimptaxrate',
+            align:"center",
+            dataIndex: 'iimptaxrate'
+           },
+		   {
+            title: 'iexptaxrate',
+            align:"center",
+            dataIndex: 'iexptaxrate'
+           },
+		   {
+            title: 'bexpsale',
+            align:"center",
+            dataIndex: 'bexpsale'
+           },
+		   {
+            title: 'idrawbatch',
+            align:"center",
+            dataIndex: 'idrawbatch'
+           },
+		   {
+            title: 'bcheckbsatp',
+            align:"center",
+            dataIndex: 'bcheckbsatp'
+           },
+		   {
+            title: 'cinvprojectcode',
+            align:"center",
+            dataIndex: 'cinvprojectcode'
+           },
+		   {
+            title: 'itestrule',
+            align:"center",
+            dataIndex: 'itestrule'
+           },
+		   {
+            title: 'crulecode',
+            align:"center",
+            dataIndex: 'crulecode'
+           },
+		   {
+            title: 'bcheckfree1',
+            align:"center",
+            dataIndex: 'bcheckfree1'
+           },
+		   {
+            title: 'bcheckfree2',
+            align:"center",
+            dataIndex: 'bcheckfree2'
+           },
+		   {
+            title: 'bcheckfree3',
+            align:"center",
+            dataIndex: 'bcheckfree3'
+           },
+		   {
+            title: 'bcheckfree4',
+            align:"center",
+            dataIndex: 'bcheckfree4'
+           },
+		   {
+            title: 'bcheckfree5',
+            align:"center",
+            dataIndex: 'bcheckfree5'
+           },
+		   {
+            title: 'bcheckfree6',
+            align:"center",
+            dataIndex: 'bcheckfree6'
+           },
+		   {
+            title: 'bcheckfree7',
+            align:"center",
+            dataIndex: 'bcheckfree7'
+           },
+		   {
+            title: 'bcheckfree8',
+            align:"center",
+            dataIndex: 'bcheckfree8'
+           },
+		   {
+            title: 'bcheckfree9',
+            align:"center",
+            dataIndex: 'bcheckfree9'
+           },
+		   {
+            title: 'bcheckfree10',
+            align:"center",
+            dataIndex: 'bcheckfree10'
+           },
+		   {
+            title: 'bbommain',
+            align:"center",
+            dataIndex: 'bbommain'
+           },
+		   {
+            title: 'bbomsub',
+            align:"center",
+            dataIndex: 'bbomsub'
+           },
+		   {
+            title: 'bproductbill',
+            align:"center",
+            dataIndex: 'bproductbill'
+           },
+		   {
+            title: 'icheckatp',
+            align:"center",
+            dataIndex: 'icheckatp'
+           },
+		   {
+            title: 'iinvatpid',
+            align:"center",
+            dataIndex: 'iinvatpid'
+           },
+		   {
+            title: 'iplantfday',
+            align:"center",
+            dataIndex: 'iplantfday'
+           },
+		   {
+            title: 'ioverlapday',
+            align:"center",
+            dataIndex: 'ioverlapday'
+           },
+		   {
+            title: 'bpiece',
+            align:"center",
+            dataIndex: 'bpiece'
+           },
+		   {
+            title: 'bsrvitem',
+            align:"center",
+            dataIndex: 'bsrvitem'
+           },
+		   {
+            title: 'bsrvfittings',
+            align:"center",
+            dataIndex: 'bsrvfittings'
+           },
+		   {
+            title: 'fmaxsupply',
+            align:"center",
+            dataIndex: 'fmaxsupply'
+           },
+		   {
+            title: 'fminsplit',
+            align:"center",
+            dataIndex: 'fminsplit'
+           },
+		   {
+            title: 'bspecialorder',
+            align:"center",
+            dataIndex: 'bspecialorder'
+           },
+		   {
+            title: 'btracksalebill',
+            align:"center",
+            dataIndex: 'btracksalebill'
+           },
+		   {
+            title: 'cinvmnemcode',
+            align:"center",
+            dataIndex: 'cinvmnemcode'
+           },
+		   {
+            title: 'iplandefault',
+            align:"center",
+            dataIndex: 'iplandefault'
+           },
+		   {
+            title: 'ipfbatchqty',
+            align:"center",
+            dataIndex: 'ipfbatchqty'
+           },
+		   {
+            title: 'iallocateprintdgt',
+            align:"center",
+            dataIndex: 'iallocateprintdgt'
+           },
+		   {
+            title: 'bcheckbatch',
+            align:"center",
+            dataIndex: 'bcheckbatch'
+           },
+		   {
+            title: 'bmngoldpart',
+            align:"center",
+            dataIndex: 'bmngoldpart'
+           },
+		   {
+            title: 'ioldpartmngrule',
+            align:"center",
+            dataIndex: 'ioldpartmngrule'
+           },
+		   {
+            title: 'cretaildefreturnwh',
+            align:"center",
+            dataIndex: 'cretaildefreturnwh'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/fbsInventory/fbsInventory/list",
+          delete: "/fbsInventory/fbsInventory/delete",
+          deleteBatch: "/fbsInventory/fbsInventory/deleteBatch",
+          exportXlsUrl: "fbsInventory/fbsInventory/exportXls",
+          importExcelUrl: "fbsInventory/fbsInventory/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsMomOrder.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.fbsMomOrder.entity.FbsMomOrder;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
+
+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：   2020-10-16
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsMomOrder/fbsMomOrder")
+@Slf4j
+public class FbsMomOrderController {
+	@Autowired
+	private IFbsMomOrderService fbsMomOrderService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsMomOrder
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsMomOrder>> queryPageList(FbsMomOrder fbsMomOrder,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsMomOrder>> result = new Result<IPage<FbsMomOrder>>();
+		QueryWrapper<FbsMomOrder> queryWrapper = QueryGenerator.initQueryWrapper(fbsMomOrder, req.getParameterMap());
+		Page<FbsMomOrder> page = new Page<FbsMomOrder>(pageNo, pageSize);
+		IPage<FbsMomOrder> pageList = fbsMomOrderService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsMomOrder
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsMomOrder> add(@RequestBody FbsMomOrder fbsMomOrder) {
+		Result<FbsMomOrder> result = new Result<FbsMomOrder>();
+		try {
+			fbsMomOrderService.save(fbsMomOrder);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsMomOrder
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsMomOrder> edit(@RequestBody FbsMomOrder fbsMomOrder) {
+		Result<FbsMomOrder> result = new Result<FbsMomOrder>();
+		FbsMomOrder fbsMomOrderEntity = fbsMomOrderService.getById(fbsMomOrder.getId());
+		if(fbsMomOrderEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsMomOrderService.updateById(fbsMomOrder);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsMomOrder> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsMomOrder> result = new Result<FbsMomOrder>();
+		FbsMomOrder fbsMomOrder = fbsMomOrderService.getById(id);
+		if(fbsMomOrder==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsMomOrderService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsMomOrder> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsMomOrder> result = new Result<FbsMomOrder>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsMomOrderService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsMomOrder> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsMomOrder> result = new Result<FbsMomOrder>();
+		FbsMomOrder fbsMomOrder = fbsMomOrderService.getById(id);
+		if(fbsMomOrder==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsMomOrder);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsMomOrder> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsMomOrder fbsMomOrder = JSON.parseObject(deString, FbsMomOrder.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsMomOrder, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsMomOrder> pageList = fbsMomOrderService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "生产订单列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsMomOrder.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<FbsMomOrder> listFbsMomOrders = ExcelImportUtil.importExcel(file.getInputStream(), FbsMomOrder.class, params);
+              for (FbsMomOrder fbsMomOrderExcel : listFbsMomOrders) {
+                  fbsMomOrderService.save(fbsMomOrderExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsMomOrders.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -0,0 +1,237 @@
+package org.jeecg.modules.fbsMomOrder.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.fbsMomOrder.entity.FbsMomOrderdetail;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
+
+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：   2020-10-16
+ * @version： V1.0
+ */
+@RestController
+@RequestMapping("/fbsMomOrder/fbsMomOrderdetail")
+@Slf4j
+public class FbsMomOrderdetailController {
+	@Autowired
+	private IFbsMomOrderdetailService fbsMomOrderdetailService;
+	
+	/**
+	  * 分页列表查询
+	 * @param fbsMomOrderdetail
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@GetMapping(value = "/list")
+	public Result<IPage<FbsMomOrderdetail>> queryPageList(FbsMomOrderdetail fbsMomOrderdetail,
+									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req) {
+		Result<IPage<FbsMomOrderdetail>> result = new Result<IPage<FbsMomOrderdetail>>();
+		QueryWrapper<FbsMomOrderdetail> queryWrapper = QueryGenerator.initQueryWrapper(fbsMomOrderdetail, req.getParameterMap());
+		Page<FbsMomOrderdetail> page = new Page<FbsMomOrderdetail>(pageNo, pageSize);
+		IPage<FbsMomOrderdetail> pageList = fbsMomOrderdetailService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+	
+	/**
+	  *   添加
+	 * @param fbsMomOrderdetail
+	 * @return
+	 */
+	@PostMapping(value = "/add")
+	public Result<FbsMomOrderdetail> add(@RequestBody FbsMomOrderdetail fbsMomOrderdetail) {
+		Result<FbsMomOrderdetail> result = new Result<FbsMomOrderdetail>();
+		try {
+			fbsMomOrderdetailService.save(fbsMomOrderdetail);
+			result.success("添加成功！");
+		} catch (Exception e) {
+			e.printStackTrace();
+			log.info(e.getMessage());
+			result.error500("操作失败");
+		}
+		return result;
+	}
+	
+	/**
+	  *  编辑
+	 * @param fbsMomOrderdetail
+	 * @return
+	 */
+	@PutMapping(value = "/edit")
+	public Result<FbsMomOrderdetail> edit(@RequestBody FbsMomOrderdetail fbsMomOrderdetail) {
+		Result<FbsMomOrderdetail> result = new Result<FbsMomOrderdetail>();
+		FbsMomOrderdetail fbsMomOrderdetailEntity = fbsMomOrderdetailService.getById(fbsMomOrderdetail.getId());
+		if(fbsMomOrderdetailEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsMomOrderdetailService.updateById(fbsMomOrderdetail);
+			//TODO 返回false说明什么？
+			if(ok) {
+				result.success("修改成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *   通过id删除
+	 * @param id
+	 * @return
+	 */
+	@DeleteMapping(value = "/delete")
+	public Result<FbsMomOrderdetail> delete(@RequestParam(name="id",required=true) String id) {
+		Result<FbsMomOrderdetail> result = new Result<FbsMomOrderdetail>();
+		FbsMomOrderdetail fbsMomOrderdetail = fbsMomOrderdetailService.getById(id);
+		if(fbsMomOrderdetail==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = fbsMomOrderdetailService.removeById(id);
+			if(ok) {
+				result.success("删除成功!");
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	  *  批量删除
+	 * @param ids
+	 * @return
+	 */
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<FbsMomOrderdetail> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<FbsMomOrderdetail> result = new Result<FbsMomOrderdetail>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别！");
+		}else {
+			this.fbsMomOrderdetailService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+	
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<FbsMomOrderdetail> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<FbsMomOrderdetail> result = new Result<FbsMomOrderdetail>();
+		FbsMomOrderdetail fbsMomOrderdetail = fbsMomOrderdetailService.getById(id);
+		if(fbsMomOrderdetail==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(fbsMomOrderdetail);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<FbsMomOrderdetail> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              FbsMomOrderdetail fbsMomOrderdetail = JSON.parseObject(deString, FbsMomOrderdetail.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(fbsMomOrderdetail, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<FbsMomOrderdetail> pageList = fbsMomOrderdetailService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "生产订单子表列表");
+      mv.addObject(NormalExcelConstants.CLASS, FbsMomOrderdetail.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<FbsMomOrderdetail> listFbsMomOrderdetails = ExcelImportUtil.importExcel(file.getInputStream(), FbsMomOrderdetail.class, params);
+              for (FbsMomOrderdetail fbsMomOrderdetailExcel : listFbsMomOrderdetails) {
+                  fbsMomOrderdetailService.save(fbsMomOrderdetailExcel);
+              }
+              return Result.ok("文件导入成功！数据行数：" + listFbsMomOrderdetails.size());
+          } catch (Exception e) {
+              log.error(e.getMessage());
+              return Result.error("文件导入失败！");
+          } finally {
+              try {
+                  file.getInputStream().close();
+              } catch (IOException e) {
+                  e.printStackTrace();
+              }
+          }
+      }
+      return Result.ok("文件导入失败！");
+  }
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrder.java

@@ -0,0 +1,129 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+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：   2020-10-16
+ * @version： V1.0
+ */
+@Data
+@TableName("mom_order")
+public class FbsMomOrder implements Serializable {
+    private static final long serialVersionUID = 1L;
+	/**id*/
+	@Excel(name = "id", width = 15)
+	@TableField(exist = false)
+	private String id;
+	/**moid*/
+	@Excel(name = "moid", width = 15)
+	private Integer moid;
+	/**mocode*/
+	@Excel(name = "mocode", width = 15)
+	private String mocode;
+	/**createdate*/
+	@Excel(name = "createdate", 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 createdate;
+	/**createuser*/
+	@Excel(name = "createuser", width = 15)
+	private String createuser;
+	/**modifydate*/
+	@Excel(name = "modifydate", 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 modifydate;
+	/**modifyuser*/
+	@Excel(name = "modifyuser", width = 15)
+	private String modifyuser;
+	/**updcount*/
+	@Excel(name = "updcount", width = 15)
+	private Integer updcount;
+//	/**ufts*/
+//	private Date ufts;
+	/**define1*/
+	@Excel(name = "define1", width = 15)
+	private String define1;
+	/**define2*/
+	@Excel(name = "define2", width = 15)
+	private String define2;
+	/**define3*/
+	@Excel(name = "define3", width = 15)
+	private String define3;
+	/**define4*/
+	@Excel(name = "define4", 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 define4;
+	/**define5*/
+	@Excel(name = "define5", width = 15)
+	private Integer define5;
+	/**define6*/
+	@Excel(name = "define6", 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 define6;
+	/**define7*/
+	@Excel(name = "define7", width = 15)
+	private Float define7;
+	/**define8*/
+	@Excel(name = "define8", width = 15)
+	private String define8;
+	/**define9*/
+	@Excel(name = "define9", width = 15)
+	private String define9;
+	/**define10*/
+	@Excel(name = "define10", width = 15)
+	private String define10;
+	/**define11*/
+	@Excel(name = "define11", width = 15)
+	private String define11;
+	/**define12*/
+	@Excel(name = "define12", width = 15)
+	private String define12;
+	/**define13*/
+	@Excel(name = "define13", width = 15)
+	private String define13;
+	/**define14*/
+	@Excel(name = "define14", width = 15)
+	private String define14;
+	/**define15*/
+	@Excel(name = "define15", width = 15)
+	private Integer define15;
+	/**define16*/
+	@Excel(name = "define16", width = 15)
+	private Float define16;
+	/**vtid*/
+	@Excel(name = "vtid", width = 15)
+	private Integer vtid;
+	/**createtime*/
+	@Excel(name = "createtime", 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;
+	/**modifytime*/
+	@Excel(name = "modifytime", 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 modifytime;
+	/**iprintcount*/
+	@Excel(name = "iprintcount", width = 15)
+	private Integer iprintcount;
+	/**relsvtid*/
+	@Excel(name = "relsvtid", width = 15)
+	private Integer relsvtid;
+	/**csysbarcode*/
+	@Excel(name = "csysbarcode", width = 15)
+	private String csysbarcode;
+}

src/main/java/org/jeecg/modules/fbsMomOrder/entity/FbsMomOrderdetail.java

@@ -0,0 +1,394 @@
+package org.jeecg.modules.fbsMomOrder.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+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：   2020-10-16
+ * @version： V1.0
+ */
+@Data
+@TableName("mom_orderdetail")
+public class FbsMomOrderdetail implements Serializable {
+    private static final long serialVersionUID = 1L;
+	/**id*/
+	@Excel(name = "id", width = 15)
+	@TableField(exist = false)
+	private String id;
+	/**modid*/
+	@Excel(name = "modid", width = 15)
+	private Integer modid;
+	/**moid*/
+	@Excel(name = "moid", width = 15)
+	private Integer moid;
+	/**sortseq*/
+	@Excel(name = "sortseq", width = 15)
+	private Integer sortseq;
+	/**moclass*/
+	@Excel(name = "moclass", width = 15)
+	private Integer moclass;
+	/**motypeid*/
+	@Excel(name = "motypeid", width = 15)
+	private Integer motypeid;
+	/**qty*/
+	@Excel(name = "qty", width = 15)
+	private Object qty;
+	/**mrpqty*/
+	@Excel(name = "mrpqty", width = 15)
+	private Object mrpqty;
+	/**auxunitcode*/
+	@Excel(name = "auxunitcode", width = 15)
+	private String auxunitcode;
+	/**auxqty*/
+	@Excel(name = "auxqty", width = 15)
+	private Object auxqty;
+	/**changerate*/
+	@Excel(name = "changerate", width = 15)
+	private Object changerate;
+	/**molotcode*/
+	@Excel(name = "molotcode", width = 15)
+	private String molotcode;
+	/**whcode*/
+	@Excel(name = "whcode", width = 15)
+	private String whcode;
+	/**mdeptcode*/
+	@Excel(name = "mdeptcode", width = 15)
+	private String mdeptcode;
+	/**sotype*/
+	@Excel(name = "sotype", width = 15)
+	private Integer sotype;
+	/**sodid*/
+	@Excel(name = "sodid", width = 15)
+	private String sodid;
+	/**socode*/
+	@Excel(name = "socode", width = 15)
+	private String socode;
+	/**soseq*/
+	@Excel(name = "soseq", width = 15)
+	private Integer soseq;
+	/**declaredqty*/
+	@Excel(name = "declaredqty", width = 15)
+	private Object declaredqty;
+	/**qualifiedinqty*/
+	@Excel(name = "qualifiedinqty", width = 15)
+	private Object qualifiedinqty;
+	/**status*/
+	@Excel(name = "status", width = 15)
+	private Integer status;
+	/**orgstatus*/
+	@Excel(name = "orgstatus", width = 15)
+	private Integer orgstatus;
+	/**bomid*/
+	@Excel(name = "bomid", width = 15)
+	private Integer bomid;
+	/**routingid*/
+	@Excel(name = "routingid", width = 15)
+	private Integer routingid;
+	/**custbomid*/
+	@Excel(name = "custbomid", width = 15)
+	private Integer custbomid;
+	/**demandid*/
+	@Excel(name = "demandid", width = 15)
+	private Integer demandid;
+	/**plancode*/
+	@Excel(name = "plancode", width = 15)
+	private String plancode;
+	/**partid*/
+	@Excel(name = "partid", width = 15)
+	private Integer partid;
+	/**invcode*/
+	@Excel(name = "invcode", width = 15)
+	private String invcode;
+	/**free1*/
+	@Excel(name = "free1", width = 15)
+	private String free1;
+	/**free2*/
+	@Excel(name = "free2", width = 15)
+	private String free2;
+	/**free3*/
+	@Excel(name = "free3", width = 15)
+	private String free3;
+	/**free4*/
+	@Excel(name = "free4", width = 15)
+	private String free4;
+	/**free5*/
+	@Excel(name = "free5", width = 15)
+	private String free5;
+	/**free6*/
+	@Excel(name = "free6", width = 15)
+	private String free6;
+	/**free7*/
+	@Excel(name = "free7", width = 15)
+	private String free7;
+	/**free8*/
+	@Excel(name = "free8", width = 15)
+	private String free8;
+	/**free9*/
+	@Excel(name = "free9", width = 15)
+	private String free9;
+	/**free10*/
+	@Excel(name = "free10", width = 15)
+	private String free10;
+	/**sfcflag*/
+	@Excel(name = "sfcflag", width = 15)
+	private Object sfcflag;
+	/**crpflag*/
+	@Excel(name = "crpflag", width = 15)
+	private Object crpflag;
+	/**qcflag*/
+	@Excel(name = "qcflag", width = 15)
+	private Object qcflag;
+	/**relsdate*/
+	@Excel(name = "relsdate", 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 relsdate;
+	/**relsuser*/
+	@Excel(name = "relsuser", width = 15)
+	private String relsuser;
+	/**closedate*/
+	@Excel(name = "closedate", 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 closedate;
+	/**orgclsdate*/
+	@Excel(name = "orgclsdate", 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 orgclsdate;
+	/**ufts*/
+	private Date ufts;
+	/**define22*/
+	@Excel(name = "define22", width = 15)
+	private String define22;
+	/**define23*/
+	@Excel(name = "define23", width = 15)
+	private String define23;
+	/**define24*/
+	@Excel(name = "define24", width = 15)
+	private String define24;
+	/**define25*/
+	@Excel(name = "define25", width = 15)
+	private String define25;
+	/**define26*/
+	@Excel(name = "define26", width = 15)
+	private Float define26;
+	/**define27*/
+	@Excel(name = "define27", width = 15)
+	private Float define27;
+	/**define28*/
+	@Excel(name = "define28", width = 15)
+	private String define28;
+	/**define29*/
+	@Excel(name = "define29", width = 15)
+	private String define29;
+	/**define30*/
+	@Excel(name = "define30", width = 15)
+	private String define30;
+	/**define31*/
+	@Excel(name = "define31", width = 15)
+	private String define31;
+	/**define32*/
+	@Excel(name = "define32", width = 15)
+	private String define32;
+	/**define33*/
+	@Excel(name = "define33", width = 15)
+	private String define33;
+	/**define34*/
+	@Excel(name = "define34", width = 15)
+	private Integer define34;
+	/**define35*/
+	@Excel(name = "define35", width = 15)
+	private Integer define35;
+	/**define36*/
+	@Excel(name = "define36", 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 define36;
+	/**define37*/
+	@Excel(name = "define37", 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 define37;
+	/**leadtime*/
+	@Excel(name = "leadtime", width = 15)
+	private Integer leadtime;
+	/**opscheduletype*/
+	@Excel(name = "opscheduletype", width = 15)
+	private Integer opscheduletype;
+	/**ordflag*/
+	@Excel(name = "ordflag", width = 15)
+	private Object ordflag;
+	/**wiptype*/
+	@Excel(name = "wiptype", width = 15)
+	private Integer wiptype;
+	/**supplywhcode*/
+	@Excel(name = "supplywhcode", width = 15)
+	private String supplywhcode;
+	/**reasoncode*/
+	@Excel(name = "reasoncode", width = 15)
+	private String reasoncode;
+	/**iswfcontrolled*/
+	@Excel(name = "iswfcontrolled", width = 15)
+	private Integer iswfcontrolled;
+	/**iverifystate*/
+	@Excel(name = "iverifystate", width = 15)
+	private Integer iverifystate;
+	/**ireturncount*/
+	@Excel(name = "ireturncount", width = 15)
+	private Integer ireturncount;
+	/**remark*/
+	@Excel(name = "remark", width = 15)
+	private String remark;
+	/**sourcemocode*/
+	@Excel(name = "sourcemocode", width = 15)
+	private String sourcemocode;
+	/**sourcemoseq*/
+	@Excel(name = "sourcemoseq", width = 15)
+	private Integer sourcemoseq;
+	/**sourcemoid*/
+	@Excel(name = "sourcemoid", width = 15)
+	private Integer sourcemoid;
+	/**sourcemodid*/
+	@Excel(name = "sourcemodid", width = 15)
+	private Integer sourcemodid;
+	/**sourceqccode*/
+	@Excel(name = "sourceqccode", width = 15)
+	private String sourceqccode;
+	/**sourceqcid*/
+	@Excel(name = "sourceqcid", width = 15)
+	private Integer sourceqcid;
+	/**sourceqcdid*/
+	@Excel(name = "sourceqcdid", width = 15)
+	private Integer sourceqcdid;
+	/**costitemcode*/
+	@Excel(name = "costitemcode", width = 15)
+	private String costitemcode;
+	/**costitemname*/
+	@Excel(name = "costitemname", width = 15)
+	private String costitemname;
+	/**relstime*/
+	@Excel(name = "relstime", 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 relstime;
+	/**closeuser*/
+	@Excel(name = "closeuser", width = 15)
+	private String closeuser;
+	/**closetime*/
+	@Excel(name = "closetime", 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 closetime;
+	/**orgclstime*/
+	@Excel(name = "orgclstime", 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 orgclstime;
+	/**auditstatus*/
+	@Excel(name = "auditstatus", width = 15)
+	private Integer auditstatus;
+	/**pallocateid*/
+	@Excel(name = "pallocateid", width = 15)
+	private Integer pallocateid;
+	/**demandcode*/
+	@Excel(name = "demandcode", width = 15)
+	private String demandcode;
+	/**collectiveflag*/
+	@Excel(name = "collectiveflag", width = 15)
+	private Integer collectiveflag;
+	/**ordertype*/
+	@Excel(name = "ordertype", width = 15)
+	private Integer ordertype;
+	/**orderdid*/
+	@Excel(name = "orderdid", width = 15)
+	private Integer orderdid;
+	/**ordercode*/
+	@Excel(name = "ordercode", width = 15)
+	private String ordercode;
+	/**orderseq*/
+	@Excel(name = "orderseq", width = 15)
+	private Integer orderseq;
+	/**manualcode*/
+	@Excel(name = "manualcode", width = 15)
+	private String manualcode;
+	/**reformflag*/
+	@Excel(name = "reformflag", width = 15)
+	private Object reformflag;
+	/**sourceqcvouchtype*/
+	@Excel(name = "sourceqcvouchtype", width = 15)
+	private Integer sourceqcvouchtype;
+	/**orgqty*/
+	@Excel(name = "orgqty", width = 15)
+	private Object orgqty;
+	/**fmflag*/
+	@Excel(name = "fmflag", width = 15)
+	private Object fmflag;
+	/**minsn*/
+	@Excel(name = "minsn", width = 15)
+	private String minsn;
+	/**maxsn*/
+	@Excel(name = "maxsn", width = 15)
+	private String maxsn;
+	/**sourcesvccode*/
+	@Excel(name = "sourcesvccode", width = 15)
+	private String sourcesvccode;
+	/**sourcesvcid*/
+	@Excel(name = "sourcesvcid", width = 15)
+	private String sourcesvcid;
+	/**sourcesvcdid*/
+	@Excel(name = "sourcesvcdid", width = 15)
+	private String sourcesvcdid;
+	/**bomtype*/
+	@Excel(name = "bomtype", width = 15)
+	private Integer bomtype;
+	/**routingtype*/
+	@Excel(name = "routingtype", width = 15)
+	private Integer routingtype;
+	/**busflowid*/
+	@Excel(name = "busflowid", width = 15)
+	private Integer busflowid;
+	/**runcardflag*/
+	@Excel(name = "runcardflag", width = 15)
+	private Object runcardflag;
+	/**requisitionflag*/
+	@Excel(name = "requisitionflag", width = 15)
+	private Object requisitionflag;
+	/**allovtid*/
+	@Excel(name = "allovtid", width = 15)
+	private Integer allovtid;
+	/**relsallovtid*/
+	@Excel(name = "relsallovtid", width = 15)
+	private Integer relsallovtid;
+	/**iprintcount*/
+	@Excel(name = "iprintcount", width = 15)
+	private Integer iprintcount;
+	/**cbsysbarcode*/
+	@Excel(name = "cbsysbarcode", width = 15)
+	private String cbsysbarcode;
+	/**ccurrentauditor*/
+	@Excel(name = "ccurrentauditor", width = 15)
+	private String ccurrentauditor;
+	/**custcode*/
+	@Excel(name = "custcode", width = 15)
+	private String custcode;
+	/**lplancode*/
+	@Excel(name = "lplancode", width = 15)
+	private String lplancode;
+	/**sourcesvcvouchtype*/
+	@Excel(name = "sourcesvcvouchtype", width = 15)
+	private Integer sourcesvcvouchtype;
+	/**factorycode*/
+	@Excel(name = "factorycode", width = 15)
+	private String factorycode;
+}

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsMomOrder.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 生产订单
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface FbsMomOrderMapper extends BaseMapper<FbsMomOrder> {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/FbsMomOrderdetailMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.fbsMomOrder.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 生产订单子表
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface FbsMomOrderdetailMapper extends BaseMapper<FbsMomOrderdetail> {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderMapper.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.fbsMomOrder.mapper.FbsMomOrderMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.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.fbsMomOrder.mapper.FbsMomOrderdetailMapper">
+
+</mapper>

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsMomOrder.service;
+
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 生产订单
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface IFbsMomOrderService extends IService<FbsMomOrder> {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/service/IFbsMomOrderdetailService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fbsMomOrder.service;
+
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 生产订单子表
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+public interface IFbsMomOrderdetailService extends IService<FbsMomOrderdetail> {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderServiceImpl.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.fbsMomOrder.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderMapper;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 生产订单
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+@Service
+@DS("multi-datasource1")
+public class FbsMomOrderServiceImpl extends ServiceImpl<FbsMomOrderMapper, FbsMomOrder> implements IFbsMomOrderService {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/service/impl/FbsMomOrderdetailServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fbsMomOrder.service.impl;
+
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrderdetail;
+import org.jeecg.modules.fbsMomOrder.mapper.FbsMomOrderdetailMapper;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderdetailService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 生产订单子表
+ * @author： jeecg-boot
+ * @date：   2020-10-16
+ * @version： V1.0
+ */
+@Service
+public class FbsMomOrderdetailServiceImpl extends ServiceImpl<FbsMomOrderdetailMapper, FbsMomOrderdetail> implements IFbsMomOrderdetailService {
+
+}

src/main/java/org/jeecg/modules/fbsMomOrder/vue/FbsMomOrderList.vue

@@ -0,0 +1,329 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="moid">
+              <a-input placeholder="请输入moid" v-model="queryParam.moid"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="mocode">
+              <a-input placeholder="请输入mocode" v-model="queryParam.mocode"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="createdate">
+              <a-input placeholder="请输入createdate" v-model="queryParam.createdate"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="createuser">
+              <a-input placeholder="请输入createuser" v-model="queryParam.createuser"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="modifydate">
+              <a-input placeholder="请输入modifydate" v-model="queryParam.modifydate"></a-input>
+            </a-form-item>
+          </a-col>
+        </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <fbsMomOrder-modal ref="modalForm" @ok="modalFormOk"></fbsMomOrder-modal>
+  </a-card>
+</template>
+
+<script>
+  import FbsMomOrderModal from './modules/FbsMomOrderModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "FbsMomOrderList",
+    mixins:[JeecgListMixin],
+    components: {
+      FbsMomOrderModal
+    },
+    data () {
+      return {
+        description: '生产订单管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'moid',
+            align:"center",
+            dataIndex: 'moid'
+           },
+		   {
+            title: 'mocode',
+            align:"center",
+            dataIndex: 'mocode'
+           },
+		   {
+            title: 'createdate',
+            align:"center",
+            dataIndex: 'createdate'
+           },
+		   {
+            title: 'createuser',
+            align:"center",
+            dataIndex: 'createuser'
+           },
+		   {
+            title: 'modifydate',
+            align:"center",
+            dataIndex: 'modifydate'
+           },
+		   {
+            title: 'modifyuser',
+            align:"center",
+            dataIndex: 'modifyuser'
+           },
+		   {
+            title: 'updcount',
+            align:"center",
+            dataIndex: 'updcount'
+           },
+		   {
+            title: 'ufts',
+            align:"center",
+            dataIndex: 'ufts'
+           },
+		   {
+            title: 'define1',
+            align:"center",
+            dataIndex: 'define1'
+           },
+		   {
+            title: 'define2',
+            align:"center",
+            dataIndex: 'define2'
+           },
+		   {
+            title: 'define3',
+            align:"center",
+            dataIndex: 'define3'
+           },
+		   {
+            title: 'define4',
+            align:"center",
+            dataIndex: 'define4'
+           },
+		   {
+            title: 'define5',
+            align:"center",
+            dataIndex: 'define5'
+           },
+		   {
+            title: 'define6',
+            align:"center",
+            dataIndex: 'define6'
+           },
+		   {
+            title: 'define7',
+            align:"center",
+            dataIndex: 'define7'
+           },
+		   {
+            title: 'define8',
+            align:"center",
+            dataIndex: 'define8'
+           },
+		   {
+            title: 'define9',
+            align:"center",
+            dataIndex: 'define9'
+           },
+		   {
+            title: 'define10',
+            align:"center",
+            dataIndex: 'define10'
+           },
+		   {
+            title: 'define11',
+            align:"center",
+            dataIndex: 'define11'
+           },
+		   {
+            title: 'define12',
+            align:"center",
+            dataIndex: 'define12'
+           },
+		   {
+            title: 'define13',
+            align:"center",
+            dataIndex: 'define13'
+           },
+		   {
+            title: 'define14',
+            align:"center",
+            dataIndex: 'define14'
+           },
+		   {
+            title: 'define15',
+            align:"center",
+            dataIndex: 'define15'
+           },
+		   {
+            title: 'define16',
+            align:"center",
+            dataIndex: 'define16'
+           },
+		   {
+            title: 'vtid',
+            align:"center",
+            dataIndex: 'vtid'
+           },
+		   {
+            title: 'createtime',
+            align:"center",
+            dataIndex: 'createtime'
+           },
+		   {
+            title: 'modifytime',
+            align:"center",
+            dataIndex: 'modifytime'
+           },
+		   {
+            title: 'iprintcount',
+            align:"center",
+            dataIndex: 'iprintcount'
+           },
+		   {
+            title: 'relsvtid',
+            align:"center",
+            dataIndex: 'relsvtid'
+           },
+		   {
+            title: 'csysbarcode',
+            align:"center",
+            dataIndex: 'csysbarcode'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/fbsMomOrder/fbsMomOrder/list",
+          delete: "/fbsMomOrder/fbsMomOrder/delete",
+          deleteBatch: "/fbsMomOrder/fbsMomOrder/deleteBatch",
+          exportXlsUrl: "fbsMomOrder/fbsMomOrder/exportXls",
+          importExcelUrl: "fbsMomOrder/fbsMomOrder/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/vue/FbsMomOrderdetailList.vue

@@ -0,0 +1,764 @@
+<template>
+  <a-card :bordered="false">
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row :gutter="24">
+
+          <a-col :md="6" :sm="8">
+            <a-form-item label="modid">
+              <a-input placeholder="请输入modid" v-model="queryParam.modid"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="moid">
+              <a-input placeholder="请输入moid" v-model="queryParam.moid"></a-input>
+            </a-form-item>
+          </a-col>
+        <template v-if="toggleSearchStatus">
+        <a-col :md="6" :sm="8">
+            <a-form-item label="sortseq">
+              <a-input placeholder="请输入sortseq" v-model="queryParam.sortseq"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="moclass">
+              <a-input placeholder="请输入moclass" v-model="queryParam.moclass"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="motypeid">
+              <a-input placeholder="请输入motypeid" v-model="queryParam.motypeid"></a-input>
+            </a-form-item>
+          </a-col>
+        </template>
+          <a-col :md="6" :sm="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange">
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+    <!-- table区域-end -->
+
+    <!-- 表单区域 -->
+    <fbsMomOrderdetail-modal ref="modalForm" @ok="modalFormOk"></fbsMomOrderdetail-modal>
+  </a-card>
+</template>
+
+<script>
+  import FbsMomOrderdetailModal from './modules/FbsMomOrderdetailModal'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+
+  export default {
+    name: "FbsMomOrderdetailList",
+    mixins:[JeecgListMixin],
+    components: {
+      FbsMomOrderdetailModal
+    },
+    data () {
+      return {
+        description: '生产订单子表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+           },
+		   {
+            title: 'modid',
+            align:"center",
+            dataIndex: 'modid'
+           },
+		   {
+            title: 'moid',
+            align:"center",
+            dataIndex: 'moid'
+           },
+		   {
+            title: 'sortseq',
+            align:"center",
+            dataIndex: 'sortseq'
+           },
+		   {
+            title: 'moclass',
+            align:"center",
+            dataIndex: 'moclass'
+           },
+		   {
+            title: 'motypeid',
+            align:"center",
+            dataIndex: 'motypeid'
+           },
+		   {
+            title: 'qty',
+            align:"center",
+            dataIndex: 'qty'
+           },
+		   {
+            title: 'mrpqty',
+            align:"center",
+            dataIndex: 'mrpqty'
+           },
+		   {
+            title: 'auxunitcode',
+            align:"center",
+            dataIndex: 'auxunitcode'
+           },
+		   {
+            title: 'auxqty',
+            align:"center",
+            dataIndex: 'auxqty'
+           },
+		   {
+            title: 'changerate',
+            align:"center",
+            dataIndex: 'changerate'
+           },
+		   {
+            title: 'molotcode',
+            align:"center",
+            dataIndex: 'molotcode'
+           },
+		   {
+            title: 'whcode',
+            align:"center",
+            dataIndex: 'whcode'
+           },
+		   {
+            title: 'mdeptcode',
+            align:"center",
+            dataIndex: 'mdeptcode'
+           },
+		   {
+            title: 'sotype',
+            align:"center",
+            dataIndex: 'sotype'
+           },
+		   {
+            title: 'sodid',
+            align:"center",
+            dataIndex: 'sodid'
+           },
+		   {
+            title: 'socode',
+            align:"center",
+            dataIndex: 'socode'
+           },
+		   {
+            title: 'soseq',
+            align:"center",
+            dataIndex: 'soseq'
+           },
+		   {
+            title: 'declaredqty',
+            align:"center",
+            dataIndex: 'declaredqty'
+           },
+		   {
+            title: 'qualifiedinqty',
+            align:"center",
+            dataIndex: 'qualifiedinqty'
+           },
+		   {
+            title: 'status',
+            align:"center",
+            dataIndex: 'status'
+           },
+		   {
+            title: 'orgstatus',
+            align:"center",
+            dataIndex: 'orgstatus'
+           },
+		   {
+            title: 'bomid',
+            align:"center",
+            dataIndex: 'bomid'
+           },
+		   {
+            title: 'routingid',
+            align:"center",
+            dataIndex: 'routingid'
+           },
+		   {
+            title: 'custbomid',
+            align:"center",
+            dataIndex: 'custbomid'
+           },
+		   {
+            title: 'demandid',
+            align:"center",
+            dataIndex: 'demandid'
+           },
+		   {
+            title: 'plancode',
+            align:"center",
+            dataIndex: 'plancode'
+           },
+		   {
+            title: 'partid',
+            align:"center",
+            dataIndex: 'partid'
+           },
+		   {
+            title: 'invcode',
+            align:"center",
+            dataIndex: 'invcode'
+           },
+		   {
+            title: 'free1',
+            align:"center",
+            dataIndex: 'free1'
+           },
+		   {
+            title: 'free2',
+            align:"center",
+            dataIndex: 'free2'
+           },
+		   {
+            title: 'free3',
+            align:"center",
+            dataIndex: 'free3'
+           },
+		   {
+            title: 'free4',
+            align:"center",
+            dataIndex: 'free4'
+           },
+		   {
+            title: 'free5',
+            align:"center",
+            dataIndex: 'free5'
+           },
+		   {
+            title: 'free6',
+            align:"center",
+            dataIndex: 'free6'
+           },
+		   {
+            title: 'free7',
+            align:"center",
+            dataIndex: 'free7'
+           },
+		   {
+            title: 'free8',
+            align:"center",
+            dataIndex: 'free8'
+           },
+		   {
+            title: 'free9',
+            align:"center",
+            dataIndex: 'free9'
+           },
+		   {
+            title: 'free10',
+            align:"center",
+            dataIndex: 'free10'
+           },
+		   {
+            title: 'sfcflag',
+            align:"center",
+            dataIndex: 'sfcflag'
+           },
+		   {
+            title: 'crpflag',
+            align:"center",
+            dataIndex: 'crpflag'
+           },
+		   {
+            title: 'qcflag',
+            align:"center",
+            dataIndex: 'qcflag'
+           },
+		   {
+            title: 'relsdate',
+            align:"center",
+            dataIndex: 'relsdate'
+           },
+		   {
+            title: 'relsuser',
+            align:"center",
+            dataIndex: 'relsuser'
+           },
+		   {
+            title: 'closedate',
+            align:"center",
+            dataIndex: 'closedate'
+           },
+		   {
+            title: 'orgclsdate',
+            align:"center",
+            dataIndex: 'orgclsdate'
+           },
+		   {
+            title: 'ufts',
+            align:"center",
+            dataIndex: 'ufts'
+           },
+		   {
+            title: 'define22',
+            align:"center",
+            dataIndex: 'define22'
+           },
+		   {
+            title: 'define23',
+            align:"center",
+            dataIndex: 'define23'
+           },
+		   {
+            title: 'define24',
+            align:"center",
+            dataIndex: 'define24'
+           },
+		   {
+            title: 'define25',
+            align:"center",
+            dataIndex: 'define25'
+           },
+		   {
+            title: 'define26',
+            align:"center",
+            dataIndex: 'define26'
+           },
+		   {
+            title: 'define27',
+            align:"center",
+            dataIndex: 'define27'
+           },
+		   {
+            title: 'define28',
+            align:"center",
+            dataIndex: 'define28'
+           },
+		   {
+            title: 'define29',
+            align:"center",
+            dataIndex: 'define29'
+           },
+		   {
+            title: 'define30',
+            align:"center",
+            dataIndex: 'define30'
+           },
+		   {
+            title: 'define31',
+            align:"center",
+            dataIndex: 'define31'
+           },
+		   {
+            title: 'define32',
+            align:"center",
+            dataIndex: 'define32'
+           },
+		   {
+            title: 'define33',
+            align:"center",
+            dataIndex: 'define33'
+           },
+		   {
+            title: 'define34',
+            align:"center",
+            dataIndex: 'define34'
+           },
+		   {
+            title: 'define35',
+            align:"center",
+            dataIndex: 'define35'
+           },
+		   {
+            title: 'define36',
+            align:"center",
+            dataIndex: 'define36'
+           },
+		   {
+            title: 'define37',
+            align:"center",
+            dataIndex: 'define37'
+           },
+		   {
+            title: 'leadtime',
+            align:"center",
+            dataIndex: 'leadtime'
+           },
+		   {
+            title: 'opscheduletype',
+            align:"center",
+            dataIndex: 'opscheduletype'
+           },
+		   {
+            title: 'ordflag',
+            align:"center",
+            dataIndex: 'ordflag'
+           },
+		   {
+            title: 'wiptype',
+            align:"center",
+            dataIndex: 'wiptype'
+           },
+		   {
+            title: 'supplywhcode',
+            align:"center",
+            dataIndex: 'supplywhcode'
+           },
+		   {
+            title: 'reasoncode',
+            align:"center",
+            dataIndex: 'reasoncode'
+           },
+		   {
+            title: 'iswfcontrolled',
+            align:"center",
+            dataIndex: 'iswfcontrolled'
+           },
+		   {
+            title: 'iverifystate',
+            align:"center",
+            dataIndex: 'iverifystate'
+           },
+		   {
+            title: 'ireturncount',
+            align:"center",
+            dataIndex: 'ireturncount'
+           },
+		   {
+            title: 'remark',
+            align:"center",
+            dataIndex: 'remark'
+           },
+		   {
+            title: 'sourcemocode',
+            align:"center",
+            dataIndex: 'sourcemocode'
+           },
+		   {
+            title: 'sourcemoseq',
+            align:"center",
+            dataIndex: 'sourcemoseq'
+           },
+		   {
+            title: 'sourcemoid',
+            align:"center",
+            dataIndex: 'sourcemoid'
+           },
+		   {
+            title: 'sourcemodid',
+            align:"center",
+            dataIndex: 'sourcemodid'
+           },
+		   {
+            title: 'sourceqccode',
+            align:"center",
+            dataIndex: 'sourceqccode'
+           },
+		   {
+            title: 'sourceqcid',
+            align:"center",
+            dataIndex: 'sourceqcid'
+           },
+		   {
+            title: 'sourceqcdid',
+            align:"center",
+            dataIndex: 'sourceqcdid'
+           },
+		   {
+            title: 'costitemcode',
+            align:"center",
+            dataIndex: 'costitemcode'
+           },
+		   {
+            title: 'costitemname',
+            align:"center",
+            dataIndex: 'costitemname'
+           },
+		   {
+            title: 'relstime',
+            align:"center",
+            dataIndex: 'relstime'
+           },
+		   {
+            title: 'closeuser',
+            align:"center",
+            dataIndex: 'closeuser'
+           },
+		   {
+            title: 'closetime',
+            align:"center",
+            dataIndex: 'closetime'
+           },
+		   {
+            title: 'orgclstime',
+            align:"center",
+            dataIndex: 'orgclstime'
+           },
+		   {
+            title: 'auditstatus',
+            align:"center",
+            dataIndex: 'auditstatus'
+           },
+		   {
+            title: 'pallocateid',
+            align:"center",
+            dataIndex: 'pallocateid'
+           },
+		   {
+            title: 'demandcode',
+            align:"center",
+            dataIndex: 'demandcode'
+           },
+		   {
+            title: 'collectiveflag',
+            align:"center",
+            dataIndex: 'collectiveflag'
+           },
+		   {
+            title: 'ordertype',
+            align:"center",
+            dataIndex: 'ordertype'
+           },
+		   {
+            title: 'orderdid',
+            align:"center",
+            dataIndex: 'orderdid'
+           },
+		   {
+            title: 'ordercode',
+            align:"center",
+            dataIndex: 'ordercode'
+           },
+		   {
+            title: 'orderseq',
+            align:"center",
+            dataIndex: 'orderseq'
+           },
+		   {
+            title: 'manualcode',
+            align:"center",
+            dataIndex: 'manualcode'
+           },
+		   {
+            title: 'reformflag',
+            align:"center",
+            dataIndex: 'reformflag'
+           },
+		   {
+            title: 'sourceqcvouchtype',
+            align:"center",
+            dataIndex: 'sourceqcvouchtype'
+           },
+		   {
+            title: 'orgqty',
+            align:"center",
+            dataIndex: 'orgqty'
+           },
+		   {
+            title: 'fmflag',
+            align:"center",
+            dataIndex: 'fmflag'
+           },
+		   {
+            title: 'minsn',
+            align:"center",
+            dataIndex: 'minsn'
+           },
+		   {
+            title: 'maxsn',
+            align:"center",
+            dataIndex: 'maxsn'
+           },
+		   {
+            title: 'sourcesvccode',
+            align:"center",
+            dataIndex: 'sourcesvccode'
+           },
+		   {
+            title: 'sourcesvcid',
+            align:"center",
+            dataIndex: 'sourcesvcid'
+           },
+		   {
+            title: 'sourcesvcdid',
+            align:"center",
+            dataIndex: 'sourcesvcdid'
+           },
+		   {
+            title: 'bomtype',
+            align:"center",
+            dataIndex: 'bomtype'
+           },
+		   {
+            title: 'routingtype',
+            align:"center",
+            dataIndex: 'routingtype'
+           },
+		   {
+            title: 'busflowid',
+            align:"center",
+            dataIndex: 'busflowid'
+           },
+		   {
+            title: 'runcardflag',
+            align:"center",
+            dataIndex: 'runcardflag'
+           },
+		   {
+            title: 'requisitionflag',
+            align:"center",
+            dataIndex: 'requisitionflag'
+           },
+		   {
+            title: 'allovtid',
+            align:"center",
+            dataIndex: 'allovtid'
+           },
+		   {
+            title: 'relsallovtid',
+            align:"center",
+            dataIndex: 'relsallovtid'
+           },
+		   {
+            title: 'iprintcount',
+            align:"center",
+            dataIndex: 'iprintcount'
+           },
+		   {
+            title: 'cbsysbarcode',
+            align:"center",
+            dataIndex: 'cbsysbarcode'
+           },
+		   {
+            title: 'ccurrentauditor',
+            align:"center",
+            dataIndex: 'ccurrentauditor'
+           },
+		   {
+            title: 'custcode',
+            align:"center",
+            dataIndex: 'custcode'
+           },
+		   {
+            title: 'lplancode',
+            align:"center",
+            dataIndex: 'lplancode'
+           },
+		   {
+            title: 'sourcesvcvouchtype',
+            align:"center",
+            dataIndex: 'sourcesvcvouchtype'
+           },
+		   {
+            title: 'factorycode',
+            align:"center",
+            dataIndex: 'factorycode'
+           },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            scopedSlots: { customRender: 'action' },
+          }
+        ],
+		url: {
+          list: "/fbsMomOrder/fbsMomOrderdetail/list",
+          delete: "/fbsMomOrder/fbsMomOrderdetail/delete",
+          deleteBatch: "/fbsMomOrder/fbsMomOrderdetail/deleteBatch",
+          exportXlsUrl: "fbsMomOrder/fbsMomOrderdetail/exportXls",
+          importExcelUrl: "fbsMomOrder/fbsMomOrderdetail/importExcel",
+       },
+    }
+  },
+  computed: {
+    importExcelUrl: function(){
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    }
+  },
+    methods: {
+     
+    }
+  }
+</script>
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 3px
+  }
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .ant-table-tbody .ant-table-row td{
+    padding-top:15px;
+    padding-bottom:15px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/vue/modules/FbsMomOrderModal.vue

@@ -0,0 +1,312 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moid">
+          <a-input-number v-decorator="[ 'moid', validatorRules.moid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mocode">
+          <a-input placeholder="请输入mocode" v-decorator="['mocode', validatorRules.mocode ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'createdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createuser">
+          <a-input placeholder="请输入createuser" v-decorator="['createuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifydate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'modifydate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifyuser">
+          <a-input placeholder="请输入modifyuser" v-decorator="['modifyuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="updcount">
+          <a-input-number v-decorator="[ 'updcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ufts">
+          <a-input placeholder="请输入ufts" v-decorator="['ufts', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define1">
+          <a-input placeholder="请输入define1" v-decorator="['define1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define2">
+          <a-input placeholder="请输入define2" v-decorator="['define2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define3">
+          <a-input placeholder="请输入define3" v-decorator="['define3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define4">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define5">
+          <a-input-number v-decorator="[ 'define5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define6">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define6', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define7">
+          <a-input placeholder="请输入define7" v-decorator="['define7', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define8">
+          <a-input placeholder="请输入define8" v-decorator="['define8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define9">
+          <a-input placeholder="请输入define9" v-decorator="['define9', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define10">
+          <a-input placeholder="请输入define10" v-decorator="['define10', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define11">
+          <a-input placeholder="请输入define11" v-decorator="['define11', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define12">
+          <a-input placeholder="请输入define12" v-decorator="['define12', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define13">
+          <a-input placeholder="请输入define13" v-decorator="['define13', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define14">
+          <a-input placeholder="请输入define14" v-decorator="['define14', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define15">
+          <a-input-number v-decorator="[ 'define15', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define16">
+          <a-input placeholder="请输入define16" v-decorator="['define16', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="vtid">
+          <a-input-number v-decorator="[ 'vtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createtime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'createtime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifytime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'modifytime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iprintcount">
+          <a-input-number v-decorator="[ 'iprintcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsvtid">
+          <a-input-number v-decorator="[ 'relsvtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="csysbarcode">
+          <a-input placeholder="请输入csysbarcode" v-decorator="['csysbarcode', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsMomOrderModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        moid:{rules: [{ required: true, message: '请输入moid!' }]},
+        mocode:{rules: [{ required: true, message: '请输入mocode!' }]},
+        },
+        url: {
+          add: "/fbsMomOrder/fbsMomOrder/add",
+          edit: "/fbsMomOrder/fbsMomOrder/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'moid','mocode','createuser','modifyuser','updcount','ufts','define1','define2','define3','define5','define7','define8','define9','define10','define11','define12','define13','define14','define15','define16','vtid','iprintcount','relsvtid','csysbarcode'))
+		  //时间格式化
+          this.form.setFieldsValue({createdate:this.model.createdate?moment(this.model.createdate):null})
+          this.form.setFieldsValue({modifydate:this.model.modifydate?moment(this.model.modifydate):null})
+          this.form.setFieldsValue({define4:this.model.define4?moment(this.model.define4):null})
+          this.form.setFieldsValue({define6:this.model.define6?moment(this.model.define6):null})
+          this.form.setFieldsValue({createtime:this.model.createtime?moment(this.model.createtime):null})
+          this.form.setFieldsValue({modifytime:this.model.modifytime?moment(this.model.modifytime):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.createdate = formData.createdate?formData.createdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.modifydate = formData.modifydate?formData.modifydate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define4 = formData.define4?formData.define4.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define6 = formData.define6?formData.define6.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.createtime = formData.createtime?formData.createtime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.modifytime = formData.modifytime?formData.modifytime.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/vue/modules/FbsMomOrderModal__Style#Drawer.vue

@@ -0,0 +1,319 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moid">
+          <a-input-number v-decorator="[ 'moid', validatorRules.moid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mocode">
+          <a-input placeholder="请输入mocode" v-decorator="['mocode', validatorRules.mocode ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'createdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createuser">
+          <a-input placeholder="请输入createuser" v-decorator="['createuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifydate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'modifydate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifyuser">
+          <a-input placeholder="请输入modifyuser" v-decorator="['modifyuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="updcount">
+          <a-input-number v-decorator="[ 'updcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ufts">
+          <a-input placeholder="请输入ufts" v-decorator="['ufts', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define1">
+          <a-input placeholder="请输入define1" v-decorator="['define1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define2">
+          <a-input placeholder="请输入define2" v-decorator="['define2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define3">
+          <a-input placeholder="请输入define3" v-decorator="['define3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define4">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define5">
+          <a-input-number v-decorator="[ 'define5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define6">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define6', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define7">
+          <a-input placeholder="请输入define7" v-decorator="['define7', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define8">
+          <a-input placeholder="请输入define8" v-decorator="['define8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define9">
+          <a-input placeholder="请输入define9" v-decorator="['define9', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define10">
+          <a-input placeholder="请输入define10" v-decorator="['define10', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define11">
+          <a-input placeholder="请输入define11" v-decorator="['define11', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define12">
+          <a-input placeholder="请输入define12" v-decorator="['define12', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define13">
+          <a-input placeholder="请输入define13" v-decorator="['define13', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define14">
+          <a-input placeholder="请输入define14" v-decorator="['define14', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define15">
+          <a-input-number v-decorator="[ 'define15', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define16">
+          <a-input placeholder="请输入define16" v-decorator="['define16', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="vtid">
+          <a-input-number v-decorator="[ 'vtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="createtime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'createtime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modifytime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'modifytime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iprintcount">
+          <a-input-number v-decorator="[ 'iprintcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsvtid">
+          <a-input-number v-decorator="[ 'relsvtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="csysbarcode">
+          <a-input placeholder="请输入csysbarcode" v-decorator="['csysbarcode', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsMomOrderModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        moid:{rules: [{ required: true, message: '请输入moid!' }]},
+        mocode:{rules: [{ required: true, message: '请输入mocode!' }]},
+        },
+        url: {
+          add: "/fbsMomOrder/fbsMomOrder/add",
+          edit: "/fbsMomOrder/fbsMomOrder/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'moid','mocode','createuser','modifyuser','updcount','ufts','define1','define2','define3','define5','define7','define8','define9','define10','define11','define12','define13','define14','define15','define16','vtid','iprintcount','relsvtid','csysbarcode'))
+		  //时间格式化
+          this.form.setFieldsValue({createdate:this.model.createdate?moment(this.model.createdate):null})
+          this.form.setFieldsValue({modifydate:this.model.modifydate?moment(this.model.modifydate):null})
+          this.form.setFieldsValue({define4:this.model.define4?moment(this.model.define4):null})
+          this.form.setFieldsValue({define6:this.model.define6?moment(this.model.define6):null})
+          this.form.setFieldsValue({createtime:this.model.createtime?moment(this.model.createtime):null})
+          this.form.setFieldsValue({modifytime:this.model.modifytime?moment(this.model.modifytime):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.createdate = formData.createdate?formData.createdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.modifydate = formData.modifydate?formData.modifydate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define4 = formData.define4?formData.define4.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define6 = formData.define6?formData.define6.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.createtime = formData.createtime?formData.createtime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.modifytime = formData.modifytime?formData.modifytime.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/vue/modules/FbsMomOrderdetailModal.vue

@@ -0,0 +1,839 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modid">
+          <a-input-number v-decorator="[ 'modid', validatorRules.modid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moid">
+          <a-input-number v-decorator="[ 'moid', validatorRules.moid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sortseq">
+          <a-input-number v-decorator="[ 'sortseq', validatorRules.sortseq ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moclass">
+          <a-input placeholder="请输入moclass" v-decorator="['moclass', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="motypeid">
+          <a-input-number v-decorator="[ 'motypeid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qty">
+          <a-input placeholder="请输入qty" v-decorator="['qty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mrpqty">
+          <a-input placeholder="请输入mrpqty" v-decorator="['mrpqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auxunitcode">
+          <a-input placeholder="请输入auxunitcode" v-decorator="['auxunitcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auxqty">
+          <a-input placeholder="请输入auxqty" v-decorator="['auxqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="changerate">
+          <a-input placeholder="请输入changerate" v-decorator="['changerate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="molotcode">
+          <a-input placeholder="请输入molotcode" v-decorator="['molotcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="whcode">
+          <a-input placeholder="请输入whcode" v-decorator="['whcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mdeptcode">
+          <a-input placeholder="请输入mdeptcode" v-decorator="['mdeptcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sotype">
+          <a-input placeholder="请输入sotype" v-decorator="['sotype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sodid">
+          <a-input placeholder="请输入sodid" v-decorator="['sodid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="socode">
+          <a-input placeholder="请输入socode" v-decorator="['socode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="soseq">
+          <a-input-number v-decorator="[ 'soseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="declaredqty">
+          <a-input placeholder="请输入declaredqty" v-decorator="['declaredqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qualifiedinqty">
+          <a-input placeholder="请输入qualifiedinqty" v-decorator="['qualifiedinqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="status">
+          <a-input placeholder="请输入status" v-decorator="['status', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgstatus">
+          <a-input placeholder="请输入orgstatus" v-decorator="['orgstatus', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="bomid">
+          <a-input-number v-decorator="[ 'bomid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="routingid">
+          <a-input-number v-decorator="[ 'routingid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="custbomid">
+          <a-input-number v-decorator="[ 'custbomid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="demandid">
+          <a-input-number v-decorator="[ 'demandid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="plancode">
+          <a-input placeholder="请输入plancode" v-decorator="['plancode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="partid">
+          <a-input-number v-decorator="[ 'partid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="invcode">
+          <a-input placeholder="请输入invcode" v-decorator="['invcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free1">
+          <a-input placeholder="请输入free1" v-decorator="['free1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free2">
+          <a-input placeholder="请输入free2" v-decorator="['free2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free3">
+          <a-input placeholder="请输入free3" v-decorator="['free3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free4">
+          <a-input placeholder="请输入free4" v-decorator="['free4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free5">
+          <a-input placeholder="请输入free5" v-decorator="['free5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free6">
+          <a-input placeholder="请输入free6" v-decorator="['free6', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free7">
+          <a-input placeholder="请输入free7" v-decorator="['free7', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free8">
+          <a-input placeholder="请输入free8" v-decorator="['free8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free9">
+          <a-input placeholder="请输入free9" v-decorator="['free9', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free10">
+          <a-input placeholder="请输入free10" v-decorator="['free10', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sfcflag">
+          <a-input placeholder="请输入sfcflag" v-decorator="['sfcflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="crpflag">
+          <a-input placeholder="请输入crpflag" v-decorator="['crpflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qcflag">
+          <a-input placeholder="请输入qcflag" v-decorator="['qcflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'relsdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsuser">
+          <a-input placeholder="请输入relsuser" v-decorator="['relsuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closedate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'closedate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgclsdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'orgclsdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ufts">
+          <a-input placeholder="请输入ufts" v-decorator="['ufts', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define22">
+          <a-input placeholder="请输入define22" v-decorator="['define22', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define23">
+          <a-input placeholder="请输入define23" v-decorator="['define23', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define24">
+          <a-input placeholder="请输入define24" v-decorator="['define24', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define25">
+          <a-input placeholder="请输入define25" v-decorator="['define25', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define26">
+          <a-input placeholder="请输入define26" v-decorator="['define26', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define27">
+          <a-input placeholder="请输入define27" v-decorator="['define27', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define28">
+          <a-input placeholder="请输入define28" v-decorator="['define28', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define29">
+          <a-input placeholder="请输入define29" v-decorator="['define29', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define30">
+          <a-input placeholder="请输入define30" v-decorator="['define30', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define31">
+          <a-input placeholder="请输入define31" v-decorator="['define31', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define32">
+          <a-input placeholder="请输入define32" v-decorator="['define32', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define33">
+          <a-input placeholder="请输入define33" v-decorator="['define33', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define34">
+          <a-input-number v-decorator="[ 'define34', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define35">
+          <a-input-number v-decorator="[ 'define35', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define36">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define36', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define37">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define37', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="leadtime">
+          <a-input-number v-decorator="[ 'leadtime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="opscheduletype">
+          <a-input placeholder="请输入opscheduletype" v-decorator="['opscheduletype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordflag">
+          <a-input placeholder="请输入ordflag" v-decorator="['ordflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="wiptype">
+          <a-input placeholder="请输入wiptype" v-decorator="['wiptype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="supplywhcode">
+          <a-input placeholder="请输入supplywhcode" v-decorator="['supplywhcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="reasoncode">
+          <a-input placeholder="请输入reasoncode" v-decorator="['reasoncode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iswfcontrolled">
+          <a-input placeholder="请输入iswfcontrolled" v-decorator="['iswfcontrolled', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iverifystate">
+          <a-input-number v-decorator="[ 'iverifystate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ireturncount">
+          <a-input-number v-decorator="[ 'ireturncount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="remark">
+          <a-input placeholder="请输入remark" v-decorator="['remark', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemocode">
+          <a-input placeholder="请输入sourcemocode" v-decorator="['sourcemocode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemoseq">
+          <a-input-number v-decorator="[ 'sourcemoseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemoid">
+          <a-input-number v-decorator="[ 'sourcemoid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemodid">
+          <a-input-number v-decorator="[ 'sourcemodid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqccode">
+          <a-input placeholder="请输入sourceqccode" v-decorator="['sourceqccode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcid">
+          <a-input-number v-decorator="[ 'sourceqcid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcdid">
+          <a-input-number v-decorator="[ 'sourceqcdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="costitemcode">
+          <a-input placeholder="请输入costitemcode" v-decorator="['costitemcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="costitemname">
+          <a-input placeholder="请输入costitemname" v-decorator="['costitemname', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relstime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'relstime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closeuser">
+          <a-input placeholder="请输入closeuser" v-decorator="['closeuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closetime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'closetime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgclstime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'orgclstime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auditstatus">
+          <a-input placeholder="请输入auditstatus" v-decorator="['auditstatus', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="pallocateid">
+          <a-input-number v-decorator="[ 'pallocateid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="demandcode">
+          <a-input placeholder="请输入demandcode" v-decorator="['demandcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="collectiveflag">
+          <a-input placeholder="请输入collectiveflag" v-decorator="['collectiveflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordertype">
+          <a-input placeholder="请输入ordertype" v-decorator="['ordertype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orderdid">
+          <a-input-number v-decorator="[ 'orderdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordercode">
+          <a-input placeholder="请输入ordercode" v-decorator="['ordercode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orderseq">
+          <a-input-number v-decorator="[ 'orderseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="manualcode">
+          <a-input placeholder="请输入manualcode" v-decorator="['manualcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="reformflag">
+          <a-input placeholder="请输入reformflag" v-decorator="['reformflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcvouchtype">
+          <a-input placeholder="请输入sourceqcvouchtype" v-decorator="['sourceqcvouchtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgqty">
+          <a-input placeholder="请输入orgqty" v-decorator="['orgqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="fmflag">
+          <a-input placeholder="请输入fmflag" v-decorator="['fmflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="minsn">
+          <a-input placeholder="请输入minsn" v-decorator="['minsn', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="maxsn">
+          <a-input placeholder="请输入maxsn" v-decorator="['maxsn', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvccode">
+          <a-input placeholder="请输入sourcesvccode" v-decorator="['sourcesvccode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcid">
+          <a-input placeholder="请输入sourcesvcid" v-decorator="['sourcesvcid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcdid">
+          <a-input placeholder="请输入sourcesvcdid" v-decorator="['sourcesvcdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="bomtype">
+          <a-input placeholder="请输入bomtype" v-decorator="['bomtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="routingtype">
+          <a-input placeholder="请输入routingtype" v-decorator="['routingtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="busflowid">
+          <a-input-number v-decorator="[ 'busflowid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="runcardflag">
+          <a-input placeholder="请输入runcardflag" v-decorator="['runcardflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="requisitionflag">
+          <a-input placeholder="请输入requisitionflag" v-decorator="['requisitionflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="allovtid">
+          <a-input-number v-decorator="[ 'allovtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsallovtid">
+          <a-input-number v-decorator="[ 'relsallovtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iprintcount">
+          <a-input-number v-decorator="[ 'iprintcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="cbsysbarcode">
+          <a-input placeholder="请输入cbsysbarcode" v-decorator="['cbsysbarcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ccurrentauditor">
+          <a-input placeholder="请输入ccurrentauditor" v-decorator="['ccurrentauditor', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="custcode">
+          <a-input placeholder="请输入custcode" v-decorator="['custcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="lplancode">
+          <a-input placeholder="请输入lplancode" v-decorator="['lplancode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcvouchtype">
+          <a-input placeholder="请输入sourcesvcvouchtype" v-decorator="['sourcesvcvouchtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="factorycode">
+          <a-input placeholder="请输入factorycode" v-decorator="['factorycode', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsMomOrderdetailModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        modid:{rules: [{ required: true, message: '请输入modid!' }]},
+        moid:{rules: [{ required: true, message: '请输入moid!' }]},
+        sortseq:{rules: [{ required: true, message: '请输入sortseq!' }]},
+        },
+        url: {
+          add: "/fbsMomOrder/fbsMomOrderdetail/add",
+          edit: "/fbsMomOrder/fbsMomOrderdetail/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'modid','moid','sortseq','moclass','motypeid','qty','mrpqty','auxunitcode','auxqty','changerate','molotcode','whcode','mdeptcode','sotype','sodid','socode','soseq','declaredqty','qualifiedinqty','status','orgstatus','bomid','routingid','custbomid','demandid','plancode','partid','invcode','free1','free2','free3','free4','free5','free6','free7','free8','free9','free10','sfcflag','crpflag','qcflag','relsuser','ufts','define22','define23','define24','define25','define26','define27','define28','define29','define30','define31','define32','define33','define34','define35','leadtime','opscheduletype','ordflag','wiptype','supplywhcode','reasoncode','iswfcontrolled','iverifystate','ireturncount','remark','sourcemocode','sourcemoseq','sourcemoid','sourcemodid','sourceqccode','sourceqcid','sourceqcdid','costitemcode','costitemname','closeuser','auditstatus','pallocateid','demandcode','collectiveflag','ordertype','orderdid','ordercode','orderseq','manualcode','reformflag','sourceqcvouchtype','orgqty','fmflag','minsn','maxsn','sourcesvccode','sourcesvcid','sourcesvcdid','bomtype','routingtype','busflowid','runcardflag','requisitionflag','allovtid','relsallovtid','iprintcount','cbsysbarcode','ccurrentauditor','custcode','lplancode','sourcesvcvouchtype','factorycode'))
+		  //时间格式化
+          this.form.setFieldsValue({relsdate:this.model.relsdate?moment(this.model.relsdate):null})
+          this.form.setFieldsValue({closedate:this.model.closedate?moment(this.model.closedate):null})
+          this.form.setFieldsValue({orgclsdate:this.model.orgclsdate?moment(this.model.orgclsdate):null})
+          this.form.setFieldsValue({define36:this.model.define36?moment(this.model.define36):null})
+          this.form.setFieldsValue({define37:this.model.define37?moment(this.model.define37):null})
+          this.form.setFieldsValue({relstime:this.model.relstime?moment(this.model.relstime):null})
+          this.form.setFieldsValue({closetime:this.model.closetime?moment(this.model.closetime):null})
+          this.form.setFieldsValue({orgclstime:this.model.orgclstime?moment(this.model.orgclstime):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.relsdate = formData.relsdate?formData.relsdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.closedate = formData.closedate?formData.closedate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.orgclsdate = formData.orgclsdate?formData.orgclsdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define36 = formData.define36?formData.define36.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define37 = formData.define37?formData.define37.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.relstime = formData.relstime?formData.relstime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.closetime = formData.closetime?formData.closetime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.orgclstime = formData.orgclstime?formData.orgclstime.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/main/java/org/jeecg/modules/fbsMomOrder/vue/modules/FbsMomOrderdetailModal__Style#Drawer.vue

@@ -0,0 +1,846 @@
+<template>
+  <a-drawer
+      :title="title"
+      :width="800"
+      placement="right"
+      :closable="false"
+      @close="close"
+      :visible="visible"
+  >
+
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+      
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="modid">
+          <a-input-number v-decorator="[ 'modid', validatorRules.modid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moid">
+          <a-input-number v-decorator="[ 'moid', validatorRules.moid ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sortseq">
+          <a-input-number v-decorator="[ 'sortseq', validatorRules.sortseq ]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="moclass">
+          <a-input placeholder="请输入moclass" v-decorator="['moclass', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="motypeid">
+          <a-input-number v-decorator="[ 'motypeid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qty">
+          <a-input placeholder="请输入qty" v-decorator="['qty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mrpqty">
+          <a-input placeholder="请输入mrpqty" v-decorator="['mrpqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auxunitcode">
+          <a-input placeholder="请输入auxunitcode" v-decorator="['auxunitcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auxqty">
+          <a-input placeholder="请输入auxqty" v-decorator="['auxqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="changerate">
+          <a-input placeholder="请输入changerate" v-decorator="['changerate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="molotcode">
+          <a-input placeholder="请输入molotcode" v-decorator="['molotcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="whcode">
+          <a-input placeholder="请输入whcode" v-decorator="['whcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="mdeptcode">
+          <a-input placeholder="请输入mdeptcode" v-decorator="['mdeptcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sotype">
+          <a-input placeholder="请输入sotype" v-decorator="['sotype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sodid">
+          <a-input placeholder="请输入sodid" v-decorator="['sodid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="socode">
+          <a-input placeholder="请输入socode" v-decorator="['socode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="soseq">
+          <a-input-number v-decorator="[ 'soseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="declaredqty">
+          <a-input placeholder="请输入declaredqty" v-decorator="['declaredqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qualifiedinqty">
+          <a-input placeholder="请输入qualifiedinqty" v-decorator="['qualifiedinqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="status">
+          <a-input placeholder="请输入status" v-decorator="['status', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgstatus">
+          <a-input placeholder="请输入orgstatus" v-decorator="['orgstatus', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="bomid">
+          <a-input-number v-decorator="[ 'bomid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="routingid">
+          <a-input-number v-decorator="[ 'routingid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="custbomid">
+          <a-input-number v-decorator="[ 'custbomid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="demandid">
+          <a-input-number v-decorator="[ 'demandid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="plancode">
+          <a-input placeholder="请输入plancode" v-decorator="['plancode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="partid">
+          <a-input-number v-decorator="[ 'partid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="invcode">
+          <a-input placeholder="请输入invcode" v-decorator="['invcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free1">
+          <a-input placeholder="请输入free1" v-decorator="['free1', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free2">
+          <a-input placeholder="请输入free2" v-decorator="['free2', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free3">
+          <a-input placeholder="请输入free3" v-decorator="['free3', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free4">
+          <a-input placeholder="请输入free4" v-decorator="['free4', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free5">
+          <a-input placeholder="请输入free5" v-decorator="['free5', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free6">
+          <a-input placeholder="请输入free6" v-decorator="['free6', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free7">
+          <a-input placeholder="请输入free7" v-decorator="['free7', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free8">
+          <a-input placeholder="请输入free8" v-decorator="['free8', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free9">
+          <a-input placeholder="请输入free9" v-decorator="['free9', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="free10">
+          <a-input placeholder="请输入free10" v-decorator="['free10', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sfcflag">
+          <a-input placeholder="请输入sfcflag" v-decorator="['sfcflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="crpflag">
+          <a-input placeholder="请输入crpflag" v-decorator="['crpflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="qcflag">
+          <a-input placeholder="请输入qcflag" v-decorator="['qcflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'relsdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsuser">
+          <a-input placeholder="请输入relsuser" v-decorator="['relsuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closedate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'closedate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgclsdate">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'orgclsdate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ufts">
+          <a-input placeholder="请输入ufts" v-decorator="['ufts', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define22">
+          <a-input placeholder="请输入define22" v-decorator="['define22', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define23">
+          <a-input placeholder="请输入define23" v-decorator="['define23', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define24">
+          <a-input placeholder="请输入define24" v-decorator="['define24', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define25">
+          <a-input placeholder="请输入define25" v-decorator="['define25', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define26">
+          <a-input placeholder="请输入define26" v-decorator="['define26', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define27">
+          <a-input placeholder="请输入define27" v-decorator="['define27', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define28">
+          <a-input placeholder="请输入define28" v-decorator="['define28', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define29">
+          <a-input placeholder="请输入define29" v-decorator="['define29', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define30">
+          <a-input placeholder="请输入define30" v-decorator="['define30', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define31">
+          <a-input placeholder="请输入define31" v-decorator="['define31', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define32">
+          <a-input placeholder="请输入define32" v-decorator="['define32', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define33">
+          <a-input placeholder="请输入define33" v-decorator="['define33', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define34">
+          <a-input-number v-decorator="[ 'define34', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define35">
+          <a-input-number v-decorator="[ 'define35', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define36">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define36', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="define37">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'define37', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="leadtime">
+          <a-input-number v-decorator="[ 'leadtime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="opscheduletype">
+          <a-input placeholder="请输入opscheduletype" v-decorator="['opscheduletype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordflag">
+          <a-input placeholder="请输入ordflag" v-decorator="['ordflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="wiptype">
+          <a-input placeholder="请输入wiptype" v-decorator="['wiptype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="supplywhcode">
+          <a-input placeholder="请输入supplywhcode" v-decorator="['supplywhcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="reasoncode">
+          <a-input placeholder="请输入reasoncode" v-decorator="['reasoncode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iswfcontrolled">
+          <a-input placeholder="请输入iswfcontrolled" v-decorator="['iswfcontrolled', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iverifystate">
+          <a-input-number v-decorator="[ 'iverifystate', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ireturncount">
+          <a-input-number v-decorator="[ 'ireturncount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="remark">
+          <a-input placeholder="请输入remark" v-decorator="['remark', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemocode">
+          <a-input placeholder="请输入sourcemocode" v-decorator="['sourcemocode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemoseq">
+          <a-input-number v-decorator="[ 'sourcemoseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemoid">
+          <a-input-number v-decorator="[ 'sourcemoid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcemodid">
+          <a-input-number v-decorator="[ 'sourcemodid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqccode">
+          <a-input placeholder="请输入sourceqccode" v-decorator="['sourceqccode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcid">
+          <a-input-number v-decorator="[ 'sourceqcid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcdid">
+          <a-input-number v-decorator="[ 'sourceqcdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="costitemcode">
+          <a-input placeholder="请输入costitemcode" v-decorator="['costitemcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="costitemname">
+          <a-input placeholder="请输入costitemname" v-decorator="['costitemname', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relstime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'relstime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closeuser">
+          <a-input placeholder="请输入closeuser" v-decorator="['closeuser', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="closetime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'closetime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgclstime">
+          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ 'orgclstime', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="auditstatus">
+          <a-input placeholder="请输入auditstatus" v-decorator="['auditstatus', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="pallocateid">
+          <a-input-number v-decorator="[ 'pallocateid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="demandcode">
+          <a-input placeholder="请输入demandcode" v-decorator="['demandcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="collectiveflag">
+          <a-input placeholder="请输入collectiveflag" v-decorator="['collectiveflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordertype">
+          <a-input placeholder="请输入ordertype" v-decorator="['ordertype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orderdid">
+          <a-input-number v-decorator="[ 'orderdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ordercode">
+          <a-input placeholder="请输入ordercode" v-decorator="['ordercode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orderseq">
+          <a-input-number v-decorator="[ 'orderseq', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="manualcode">
+          <a-input placeholder="请输入manualcode" v-decorator="['manualcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="reformflag">
+          <a-input placeholder="请输入reformflag" v-decorator="['reformflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourceqcvouchtype">
+          <a-input placeholder="请输入sourceqcvouchtype" v-decorator="['sourceqcvouchtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="orgqty">
+          <a-input placeholder="请输入orgqty" v-decorator="['orgqty', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="fmflag">
+          <a-input placeholder="请输入fmflag" v-decorator="['fmflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="minsn">
+          <a-input placeholder="请输入minsn" v-decorator="['minsn', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="maxsn">
+          <a-input placeholder="请输入maxsn" v-decorator="['maxsn', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvccode">
+          <a-input placeholder="请输入sourcesvccode" v-decorator="['sourcesvccode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcid">
+          <a-input placeholder="请输入sourcesvcid" v-decorator="['sourcesvcid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcdid">
+          <a-input placeholder="请输入sourcesvcdid" v-decorator="['sourcesvcdid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="bomtype">
+          <a-input placeholder="请输入bomtype" v-decorator="['bomtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="routingtype">
+          <a-input placeholder="请输入routingtype" v-decorator="['routingtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="busflowid">
+          <a-input-number v-decorator="[ 'busflowid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="runcardflag">
+          <a-input placeholder="请输入runcardflag" v-decorator="['runcardflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="requisitionflag">
+          <a-input placeholder="请输入requisitionflag" v-decorator="['requisitionflag', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="allovtid">
+          <a-input-number v-decorator="[ 'allovtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="relsallovtid">
+          <a-input-number v-decorator="[ 'relsallovtid', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="iprintcount">
+          <a-input-number v-decorator="[ 'iprintcount', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="cbsysbarcode">
+          <a-input placeholder="请输入cbsysbarcode" v-decorator="['cbsysbarcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="ccurrentauditor">
+          <a-input placeholder="请输入ccurrentauditor" v-decorator="['ccurrentauditor', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="custcode">
+          <a-input placeholder="请输入custcode" v-decorator="['custcode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="lplancode">
+          <a-input placeholder="请输入lplancode" v-decorator="['lplancode', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="sourcesvcvouchtype">
+          <a-input placeholder="请输入sourcesvcvouchtype" v-decorator="['sourcesvcvouchtype', {}]" />
+        </a-form-item>
+        <a-form-item
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          label="factorycode">
+          <a-input placeholder="请输入factorycode" v-decorator="['factorycode', {}]" />
+        </a-form-item>
+		
+      </a-form>
+    </a-spin>
+    <a-button type="primary" @click="handleOk">确定</a-button>
+    <a-button type="primary" @click="handleCancel">取消</a-button>
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction } from '@/api/manage'
+  import pick from 'lodash.pick'
+  import moment from "moment"
+
+  export default {
+    name: "FbsMomOrderdetailModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+        modid:{rules: [{ required: true, message: '请输入modid!' }]},
+        moid:{rules: [{ required: true, message: '请输入moid!' }]},
+        sortseq:{rules: [{ required: true, message: '请输入sortseq!' }]},
+        },
+        url: {
+          add: "/fbsMomOrder/fbsMomOrderdetail/add",
+          edit: "/fbsMomOrder/fbsMomOrderdetail/edit",
+        },
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model,'modid','moid','sortseq','moclass','motypeid','qty','mrpqty','auxunitcode','auxqty','changerate','molotcode','whcode','mdeptcode','sotype','sodid','socode','soseq','declaredqty','qualifiedinqty','status','orgstatus','bomid','routingid','custbomid','demandid','plancode','partid','invcode','free1','free2','free3','free4','free5','free6','free7','free8','free9','free10','sfcflag','crpflag','qcflag','relsuser','ufts','define22','define23','define24','define25','define26','define27','define28','define29','define30','define31','define32','define33','define34','define35','leadtime','opscheduletype','ordflag','wiptype','supplywhcode','reasoncode','iswfcontrolled','iverifystate','ireturncount','remark','sourcemocode','sourcemoseq','sourcemoid','sourcemodid','sourceqccode','sourceqcid','sourceqcdid','costitemcode','costitemname','closeuser','auditstatus','pallocateid','demandcode','collectiveflag','ordertype','orderdid','ordercode','orderseq','manualcode','reformflag','sourceqcvouchtype','orgqty','fmflag','minsn','maxsn','sourcesvccode','sourcesvcid','sourcesvcdid','bomtype','routingtype','busflowid','runcardflag','requisitionflag','allovtid','relsallovtid','iprintcount','cbsysbarcode','ccurrentauditor','custcode','lplancode','sourcesvcvouchtype','factorycode'))
+		  //时间格式化
+          this.form.setFieldsValue({relsdate:this.model.relsdate?moment(this.model.relsdate):null})
+          this.form.setFieldsValue({closedate:this.model.closedate?moment(this.model.closedate):null})
+          this.form.setFieldsValue({orgclsdate:this.model.orgclsdate?moment(this.model.orgclsdate):null})
+          this.form.setFieldsValue({define36:this.model.define36?moment(this.model.define36):null})
+          this.form.setFieldsValue({define37:this.model.define37?moment(this.model.define37):null})
+          this.form.setFieldsValue({relstime:this.model.relstime?moment(this.model.relstime):null})
+          this.form.setFieldsValue({closetime:this.model.closetime?moment(this.model.closetime):null})
+          this.form.setFieldsValue({orgclstime:this.model.orgclstime?moment(this.model.orgclstime):null})
+        });
+
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            let formData = Object.assign(this.model, values);
+            //时间格式化
+            formData.relsdate = formData.relsdate?formData.relsdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.closedate = formData.closedate?formData.closedate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.orgclsdate = formData.orgclsdate?formData.orgclsdate.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define36 = formData.define36?formData.define36.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.define37 = formData.define37?formData.define37.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.relstime = formData.relstime?formData.relstime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.closetime = formData.closetime?formData.closetime.format('YYYY-MM-DD HH:mm:ss'):null;
+            formData.orgclstime = formData.orgclstime?formData.orgclstime.format('YYYY-MM-DD HH:mm:ss'):null;
+            
+            console.log(formData)
+            httpAction(httpurl,formData,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+
+
+
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+</style>

src/main/java/org/jeecg/modules/fbsPerson/entity/FbsPerson.java

@@ -57,22 +57,27 @@ public class FbsPerson implements Serializable {
 	/**iofferrate*/
 	@Excel(name = "iofferrate", width = 15)
 	private Float iofferrate;
-	/**pubufts*/
-	private Date pubufts;
+//	/**pubufts*/
+//	private Date pubufts;
 	/**cpersonemail*/
 	@Excel(name = "cpersonemail", width = 15)
 	private String cpersonemail;
 	/**cpersonphone*/
 	@Excel(name = "cpersonphone", width = 15)
 	private String cpersonphone;
-	/**dpvaliddate*/
-	@Excel(name = "dpvaliddate", 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 dpvaliddate;
-	/**dpinvaliddate*/
-	@Excel(name = "dpinvaliddate", 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 dpinvaliddate;
+//	/**dpvaliddate*/
+//	@Excel(name = "dpvaliddate", 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 dpvaliddate;
+//	/**dpinvaliddate*/
+//	@Excel(name = "dpinvaliddate", 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 dpinvaliddate;
+
+
+	/**cdepname*/
+	@Excel(name = "cdepname", width = 15)
+	private String cdepname;
 }

src/main/java/org/jeecg/modules/fbsPerson/mapper/FbsPersonMapper.java

@@ -13,5 +13,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @version： V1.0
  */
 public interface FbsPersonMapper extends BaseMapper<FbsPerson> {
-
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询U8人员数据
+    * @Date 2020/10/16 16:22
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>
+    */
+    List<FbsPerson> getPerAndDerp();
 }

src/main/java/org/jeecg/modules/fbsPerson/mapper/xml/FbsPersonMapper.xml

@@ -1,5 +1,13 @@
 <?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.fbsPerson.mapper.FbsPersonMapper">
-
+    <select id="getPerAndDerp" resultType="org.jeecg.modules.fbsPerson.entity.FbsPerson">
+        SELECT
+            p.*,
+            d.cDepCode
+        FROM
+            Person p
+            LEFT JOIN Department d ON p.cDepCode= d.cDepCode
+            ORDER by p.cPersonName
+    </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsPerson/service/IFbsPersonService.java

@@ -3,12 +3,22 @@ package org.jeecg.modules.fbsPerson.service;
 import org.jeecg.modules.fbsPerson.entity.FbsPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: 人员档案
  * @author： jeecg-boot
  * @date：   2020-10-16
  * @version： V1.0
  */
-public interface IFbsPersonService extends IService<FbsPerson> {
 
+public interface IFbsPersonService extends IService<FbsPerson> {
+    /**
+    * @Author chenchuang
+    * @Description //TODO 查询U8人员数据
+    * @Date 2020/10/16 16:22
+    * @Param []
+    * @return java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>
+    */
+    List<FbsPerson> getPerAndDerp();
 }

src/main/java/org/jeecg/modules/fbsPerson/service/impl/FbsPersonServiceImpl.java

@@ -8,6 +8,9 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * @Description: 人员档案
  * @author： jeecg-boot
@@ -18,4 +21,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @DS("multi-datasource1")
 public class FbsPersonServiceImpl extends ServiceImpl<FbsPersonMapper, FbsPerson> implements IFbsPersonService {
 
+    @Resource
+    FbsPersonMapper fbsPersonMapper;
+
+    @Override
+    public List<FbsPerson> getPerAndDerp() {
+        return fbsPersonMapper.getPerAndDerp();
+    }
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/controller/FbsWorkshopDispatchListController.java

@@ -11,6 +11,12 @@ 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.fbsInventory.entity.FbsInventory;
+import org.jeecg.modules.fbsInventory.service.IFbsInventoryService;
+import org.jeecg.modules.fbsMomOrder.entity.FbsMomOrder;
+import org.jeecg.modules.fbsMomOrder.service.IFbsMomOrderService;
+import org.jeecg.modules.fbsPerson.entity.FbsPerson;
+import org.jeecg.modules.fbsPerson.service.IFbsPersonService;
 import org.jeecg.modules.fbsWorkshopDispatchList.entity.FbsWorkshopDispatchList;
 import org.jeecg.modules.fbsWorkshopDispatchList.service.IFbsWorkshopDispatchListService;
 
@@ -45,7 +51,16 @@ import com.alibaba.fastjson.JSON;
 public class FbsWorkshopDispatchListController {
 	@Autowired
 	private IFbsWorkshopDispatchListService fbsWorkshopDispatchListService;
-	
+
+	 @Autowired
+	 IFbsPersonService iFbsPersonService;
+
+	 @Autowired
+	 IFbsMomOrderService iFbsMomOrderService;
+
+	 @Autowired
+	 IFbsInventoryService iFbsInventoryService;
+
 	/**
 	  * 分页列表查询
 	 * @param fbsWorkshopDispatchList
@@ -260,4 +275,68 @@ public class FbsWorkshopDispatchListController {
 		 return result;
 	 }
 
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 查询U8人员信息
+	 * @Date 2020/10/16 16:18
+	 * @Param []
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>>
+	 */
+	 @GetMapping(value = "/getPerAndDerp")
+	 public Result<List<FbsPerson>> getPerAndDerp(){
+	 	Result<List<FbsPerson>> result =new Result<>();
+		 try {
+			 List<FbsPerson> fbsPersonList=iFbsPersonService.getPerAndDerp();
+			 result.setResult(fbsPersonList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	  * @Author chenchuang
+	  * @Description //TODO U8生产订单查询
+	  * @Date 2020/10/16 16:18
+	  * @Param []
+	  * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>>
+	  */
+	 @GetMapping(value = "/getFbsMomOrder")
+	 public Result<List<FbsMomOrder>> getFbsMomOrder(){
+		 Result<List<FbsMomOrder>> result =new Result<>();
+		 try {
+			 List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list();
+			 result.setResult(fbsMomOrderList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+		 return result;
+	 }
+
+	 /**
+	 * @Author chenchuang
+	 * @Description //TODO 根据生产订单id查询产品
+	 * @Date 2020/10/16 19:03
+	 * @Param [moId]
+	 * @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsInventory.entity.FbsInventory>>
+	 */
+	 @GetMapping(value = "/getInventoryGetByOrderId")
+	 public Result<List<FbsInventory>> getInventoryGetByOrderId(String moId){
+		 Result<List<FbsInventory>> result =new Result<>();
+		 try {
+			 List<FbsInventory> fbsInventoryList=iFbsInventoryService.getInventoryGetByOrderId(moId);
+			 result.setResult(fbsInventoryList);
+			 result.success("操作成功");
+		 } catch (Exception e) {
+			 e.printStackTrace();
+			 result.error500("操作失败："+e.getMessage());
+		 }
+
+		 return result;
+	 }
+
 }

src/main/java/org/jeecg/modules/fbsWorkshopDispatchList/entity/FbsWorkshopDispatchList.java

@@ -46,7 +46,9 @@ public class FbsWorkshopDispatchList implements Serializable {
 	private String productionOrderNumberName;
 	/**产品*/
 	@Excel(name = "产品", width = 15)
-	private String product;
+	private String product;/**产品id*/
+	@Excel(name = "产品id", width = 15)
+	private String productId;
 	/**任务数量*/
 	@Excel(name = "任务数量", width = 15)
 	private Integer numberOfTasks;
@@ -108,6 +110,10 @@ public class FbsWorkshopDispatchList implements Serializable {
 	@Excel(name = "生产线名称", width = 15)
 	private String productionLineName;
 
+	/**生产线id*/
+	@Excel(name = "生产线id", width = 15)
+	private String productionLineId;
+
     /**状态（0初始，1接单,2暂停，3完成）*/
     @Excel(name = "状态", width = 15)
     private String state;