Merge remote-tracking branch 'factory-java/dev' into dev

# Conflicts:
#	jeecg-boot-erp/src/main/java/org/jeecg/modules/erp/order_form/controller/TblOrderFormController.java

@@ -114,6 +114,7 @@ public class TblBiddingShenqController extends JeecgController<TblBiddingShenq,
 	@ApiOperation(value="tbl_bidding_shenq-编辑", notes="tbl_bidding_shenq-编辑")
 	@ApiOperation(value="tbl_bidding_shenq-编辑", notes="tbl_bidding_shenq-编辑")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TblBiddingShenq tblBiddingShenq) {
 	public Result<String> edit(@RequestBody TblBiddingShenq tblBiddingShenq) {
+		tblBiddingShenq.setSqTime(new Date());
 		tblBiddingShenqService.updateById(tblBiddingShenq);
 		tblBiddingShenqService.updateById(tblBiddingShenq);
 		return Result.OK("编辑成功!");
 		return Result.OK("编辑成功!");
 	}
 	}

@@ -131,16 +131,16 @@ public class TblBiddingShenq implements Serializable {
     @ApiModelProperty(value = "创建人")
     @ApiModelProperty(value = "创建人")
     private String createBy;
     private String createBy;
 	/**创建日期*/
 	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "创建日期")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
     private Date createTime;
 	/**更新人*/
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
     @ApiModelProperty(value = "更新人")
     private String updateBy;
     private String updateBy;
 	/**更新日期*/
 	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd hh:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新日期")
     @ApiModelProperty(value = "更新日期")
     private Date updateTime;
     private Date updateTime;
 
 

 package org.jeecg.modules.erp.order_form.controller;
 package org.jeecg.modules.erp.order_form.controller;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,11 +18,18 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
+import org.jeecg.modules.erp.order_form.entity.TblProductType;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
 import org.jeecg.modules.erp.order_form.entity.TblWorkPrice;
 import org.jeecg.modules.erp.order_form.entity.TblWorkPrice;
+import org.jeecg.modules.erp.order_form.form.OrderForm;
+import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService;
+import org.jeecg.modules.erp.production.entity.TblProductionGongxu;
+import org.jeecg.modules.erp.production.entity.TblProductionPlan;
+import org.jeecg.modules.erp.production.service.ITblProductionGongxuService;
+import org.jeecg.modules.erp.production.service.ITblProductionPlanService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -35,6 +44,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
@@ -62,6 +72,8 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 	 @Autowired
 	 @Autowired
 	 private ITblWorkPriceService iTblWorkPriceService;
 	 private ITblWorkPriceService iTblWorkPriceService;
 
 
+	 @Autowired
+	 private ITblProductionPlanService planService;
 
 
 	/*---------------------------------主表处理-begin-------------------------------------*/
 	/*---------------------------------主表处理-begin-------------------------------------*/
 
 
@@ -76,14 +88,14 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 	//@AutoLog(value = "订单表-分页列表查询")
 	//@AutoLog(value = "订单表-分页列表查询")
 	@ApiOperation(value="订单表-分页列表查询", notes="订单表-分页列表查询")
 	@ApiOperation(value="订单表-分页列表查询", notes="订单表-分页列表查询")
 	@GetMapping(value = "/list")
 	@GetMapping(value = "/list")
-	public Result<IPage<TblOrderForm>> queryPageList(TblOrderForm tblOrderForm,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-
-		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
-		Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
-		IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page,tblOrderForm);
+	public Result<IPage<TblOrderFormModel>> queryPageList(TblOrderFormModel tblOrderForm,
+														  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														  HttpServletRequest req) {
+
+//		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
+		Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
+		IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page,tblOrderForm);
 		return Result.OK(pageList);
 		return Result.OK(pageList);
 	}
 	}
 
 

 package org.jeecg.modules.erp.order_form.form;
 package org.jeecg.modules.erp.order_form.form;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -19,89 +20,89 @@ public class OrderForm implements Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
 	/**主键*/
 	/**主键*/
-    private java.lang.String id;
+    private String id;
 	/**创建人*/
 	/**创建人*/
-    private java.lang.String createBy;
+    private String createBy;
     @JsonFormat(timezone = "GMT+8",pattern = "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")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private java.util.Date createTime;
+    private Date createTime;
 	/**更新人*/
 	/**更新人*/
-    private java.lang.String updateBy;
+    private String updateBy;
 	/**更新日期*/
 	/**更新日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "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")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    private java.util.Date updateTime;
+    private Date updateTime;
 	/**所属部门*/
 	/**所属部门*/
-    private java.lang.String sysOrgCode;
+    private String sysOrgCode;
 	/**主料号*/
 	/**主料号*/
-    private java.lang.String orderId;
+    private String orderId;
 	/**订货单位*/
 	/**订货单位*/
-    private java.lang.String orderCompany;
+    private String orderCompany;
 
 
-    private java.lang.String workOrder;
+    private String workOrder;
 
 
-    private java.lang.String productName;
+    private String productName;
 
 
-    private java.lang.String productType;
+    private String productType;
 
 
-    private java.lang.String designer;
+    private String designer;
 
 
 
 
 //    @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd")
 //    @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd")
 //    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
 //    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
 //    @DateTimeFormat(pattern="yyyy-MM-dd")
 //    @DateTimeFormat(pattern="yyyy-MM-dd")
 //    @ApiModelProperty(value = "分派设计任务日期")
 //    @ApiModelProperty(value = "分派设计任务日期")
-//    private java.util.Date assignDesignDate;
+//    private Date assignDesignDate;
 
 
 	/**订单日期*/
 	/**订单日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date orderDate;
+    private Date orderDate;
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date dispatchDate;
+    private Date dispatchDate;
 
 
 	/**交货日期*/
 	/**交货日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date deliveryDate;
+    private Date deliveryDate;
 
 
-    private java.lang.String quantity;
+    private String quantity;
 
 
 	/**状态*/
 	/**状态*/
-    private java.lang.String status;
+    private String status;
 
 
-    private java.lang.String totalWorkingHours;
+    private String totalWorkingHours;
 
 
-    private java.lang.String dispatchedWorkingHours;
+    private String dispatchedWorkingHours;
 	/**实际完成时间*/
 	/**实际完成时间*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date finishDate;
+    private Date finishDate;
 
 
 
 
-    private java.lang.String assignDesignStatus;
+    private String assignDesignStatus;
 
 
-    private java.lang.String dispatchStatus;
+    private String dispatchStatus;
 
 
-    private java.lang.String productDesignStatus;
+    private String productDesignStatus;
 
 
-    private java.lang.String verifyStatus;
+    private String verifyStatus;
 
 
 	/**出货检验*/
 	/**出货检验*/
-    private java.lang.String verifyResult;
+    private String verifyResult;
 	/**出货日期*/
 	/**出货日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    private java.util.Date deliveryDate1;
+    private Date deliveryDate1;
 	/**主料图片*/
 	/**主料图片*/
-    private java.lang.String pics;
+    private String pics;
 
 
-    private java.lang.String files;
+    private String files;
 
 
     private List<TblBiddingShenq> biddingSqList;
     private List<TblBiddingShenq> biddingSqList;
     /**收货图片*/
     /**收货图片*/
 //    @Excel(name = "收货图片", width = 15)
 //    @Excel(name = "收货图片", width = 15)
 //    @ApiModelProperty(value = "收货图片")
 //    @ApiModelProperty(value = "收货图片")
-//    private java.lang.String pics2;
+//    private String pics2;
 }
 }

+package org.jeecg.modules.erp.order_form.form;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 订单表
+ * @Author: jeecg-boot
+ * @Date:   2022-07-12
+ * @Version: V1.0
+ */
+@Data
+//@TableName("tbl_order_form")
+@ApiModel(value="tbl_order_form对象", description="订单表")
+public class TblOrderFormModel implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**主料号*/
+    @Excel(name = "主料号", width = 15)
+    @ApiModelProperty(value = "主料号")
+    private String orderId;
+	/**订货单位*/
+    @Excel(name = "订货单位", width = 15)
+    @ApiModelProperty(value = "订货单位")
+    private String orderCompany;
+
+    @Excel(name = "工作令", width = 15)
+    @ApiModelProperty(value = "工作令")
+    private String workOrder;
+
+    @Excel(name = "产品名称", width = 15)
+    @ApiModelProperty(value = "产品名称")
+    private String productName;
+
+    @Excel(name = "产品类型id", width = 15)
+    @ApiModelProperty(value = "产品类型id")
+    private String productType;
+
+    @Excel(name = "产品类型", width = 15)
+    @ApiModelProperty(value = "产品类型")
+    private String productTypeName ;
+
+    @Excel(name = "设计人员角色", width = 15)
+    @ApiModelProperty(value = "设计人员角色")
+    private String designRole;
+    @Excel(name = "设计人员", width = 15)
+    @ApiModelProperty(value = "设计人员")
+    private String designer;
+
+
+//    @Excel(name = "分派设计任务日期", width = 15, format = "yyyy-MM-dd")
+//    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+//    @DateTimeFormat(pattern="yyyy-MM-dd")
+//    @ApiModelProperty(value = "分派设计任务日期")
+//    private java.util.Date assignDesignDate;
+
+	/**订单日期*/
+    @Excel(name = "任务下达日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "订单日期")
+    private Date orderDate;
+
+    @Excel(name = "派工日期", width = 15, format = "yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "派工日期")
+    private Date dispatchDate;
+
+	/**交货日期*/
+    @Excel(name = "交货日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "交货日期")
+    private Date deliveryDate;
+
+    @Excel(name = "数量", width = 15)
+    @ApiModelProperty(value = "数量")
+    private String quantity;
+
+	/**状态*/
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    @Excel(name = "总工时", width = 15)
+    @ApiModelProperty(value = "总工时")
+    private String totalWorkingHours;
+
+    @Excel(name = "已派发工时", width = 15)
+    @ApiModelProperty(value = "已派发工时")
+    private String dispatchedWorkingHours;
+	/**实际完成时间*/
+    @Excel(name = "实际完成时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "实际完成时间")
+    private Date finishDate;
+
+
+    @Excel(name = "是否分派设计 0 未分派 1已分派", width = 15)
+    @ApiModelProperty(value = "是否分派设计 0 未分派 1已分派")
+    private String assignDesignStatus;
+
+    @Excel(name = "分派状态 0 未分派 1已分派", width = 15)
+    @ApiModelProperty(value = "分派状态 0 未分派 1已分派")
+    private String dispatchStatus;
+
+    @Excel(name = "产品设计状态：0未设计 1已设计", width = 15)
+    @ApiModelProperty(value = "产品设计状态：0未设计 1已设计")
+    private String productDesignStatus;
+
+    @Excel(name = "检验状态：0未检验 1已检验", width = 15)
+    @ApiModelProperty(value = "检验状态：0未检验 1已检验")
+    private String verifyStatus;
+
+	/**出货检验*/
+    @Excel(name = "出货检验", width = 15)
+    @ApiModelProperty(value = "出货检验")
+    private String verifyResult;
+	/**出货日期*/
+    @Excel(name = "出货日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "出货日期")
+    private Date deliveryDate1;
+	/**主料图片*/
+    @Excel(name = "主料图片", width = 15)
+    @ApiModelProperty(value = "主料图片")
+    private String pics;
+
+    @Excel(name = "主料文件", width = 15)
+    @ApiModelProperty(value = "主料文件")
+    private String files;
+
+    /**收货图片*/
+//    @Excel(name = "收货图片", width = 15)
+//    @ApiModelProperty(value = "收货图片")
+//    private java.lang.String pics2;
+}

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
+import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -25,6 +26,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 
 
-    Page<TblOrderForm>  selectList(Page<TblOrderForm> page,@Param("qc") TblOrderForm tblOrderForm);
+    Page<TblOrderFormModel>  selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
 
 
 }
 }

@@ -55,10 +55,10 @@
     <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
     <update id="updateProductDesignStatusByOrderId" parameterType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
        update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId}
        update tbl_order_form set product_design_status = #{productDesignStatus} where order_id =#{orderId}
     </update>
     </update>
-    <select id="selectList" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
+    <select id="selectList" resultType="org.jeecg.modules.erp.order_form.form.TblOrderFormModel">
         SELECT
         SELECT
             a.id,a.create_by,a.create_time,a.update_by,a.update_time,
             a.id,a.create_by,a.create_time,a.update_by,a.update_time,
-            a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type_id,c.product_type_name as product_type,a.order_date,a.design_role,a.designer,a.dispatch_date,
+            a.sys_org_code,a.order_id,a.order_company,a.work_order,a.product_name, c.product_type_id as product_type ,c.product_type_name,a.order_date,a.design_role,a.designer,a.dispatch_date,
             a.delivery_date,a.quantity,a.total_working_hours,if(b.dispatched_working_hours != 0,b.dispatched_working_hours,0) dispatched_working_hours,a.STATUS,a.finish_date,a.assign_design_status,
             a.delivery_date,a.quantity,a.total_working_hours,if(b.dispatched_working_hours != 0,b.dispatched_working_hours,0) dispatched_working_hours,a.STATUS,a.finish_date,a.assign_design_status,
             a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2
             a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.files,a.pics2
         FROM
         FROM

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.bidding_info.form.BiddingShenqForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
+import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collection;
@@ -41,6 +42,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 
 
-	Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm);
+	Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
 
 
 }
 }

@@ -3,6 +3,7 @@ package org.jeecg.modules.erp.order_form.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
+import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper;
 import org.jeecg.modules.erp.order_form.mapper.TblOrderFormMapper;
 import org.jeecg.modules.erp.order_form.mapper.TblWorkOrderMapper;
 import org.jeecg.modules.erp.order_form.mapper.TblWorkOrderMapper;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
@@ -70,7 +71,7 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
 	}
 	}
 
 
 	@Override
 	@Override
-	public Page<TblOrderForm> selectList(Page<TblOrderForm> page, TblOrderForm tblOrderForm) {
+	public Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm) {
 		return tblOrderFormMapper.selectList(page,tblOrderForm);
 		return tblOrderFormMapper.selectList(page,tblOrderForm);
 	}
 	}
 
 

@@ -17,6 +17,7 @@ import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
 import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.form.OrderForm;
 import org.jeecg.modules.erp.order_form.form.OrderForm;
+import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.product_design.entity.TblProductDesign;
 import org.jeecg.modules.erp.product_design.entity.TblProductDesign;
 import org.jeecg.modules.erp.product_design.service.ITblProductDesignService;
 import org.jeecg.modules.erp.product_design.service.ITblProductDesignService;
@@ -49,7 +50,7 @@ public class ProductDesignController {
 
 
     //产品设计订单列表
     //产品设计订单列表
     @GetMapping(value = "/productDesignList")
     @GetMapping(value = "/productDesignList")
-    public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
+    public Result<IPage<TblOrderFormModel>> getProductDesignList(TblOrderFormModel tblOrderForm,
                                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                             HttpServletRequest req) {
                                                             HttpServletRequest req) {
@@ -60,8 +61,8 @@ public class ProductDesignController {
         tblOrderForm.setDesigner(sysUser.getWorkNo());
         tblOrderForm.setDesigner(sysUser.getWorkNo());
 //        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 //        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 //        queryWrapper.eq("designer", sysUser.getWorkNo());
 //        queryWrapper.eq("designer", sysUser.getWorkNo());
-        Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
-        IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page, tblOrderForm);
+        Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
+        IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page, tblOrderForm);
         return Result.OK(pageList);
         return Result.OK(pageList);
     }
     }