雷海东 / factory-java · 提交

转到一个项目

作者 张晓杰
提交 4e67085f6939d2cb1561e46ec16b3c2914ffe92d 1 个父辈 7b5aca17

生产订单

内嵌 并排对比
正在显示 9 个修改的文件 包含 61 行增加 和 16 行删除
@@ -107,7 +107,13 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr @@ -107,7 +107,13 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
107 String type = tblOrderForm.getProductType() + DateUtil.format(new Date(), "YYYYMM"); 107 String type = tblOrderForm.getProductType() + DateUtil.format(new Date(), "YYYYMM");
108 String orderId = tblOrderFormService.getCountByType(type); 108 String orderId = tblOrderFormService.getCountByType(type);
109 log.info("订单编号："+ orderId); 109 log.info("订单编号："+ orderId);
110 - String orderIdNew= type + StrUtil.padPre(String.valueOf(Integer.valueOf(orderId.substring(8))+1),4, '0'); 110 + Integer temp = null;
  111 + if(StrUtil.isBlank(orderId)){
  112 + temp = 0;
  113 + }else{
  114 + temp =Integer.valueOf(orderId.substring(8));
  115 + }
  116 + String orderIdNew= type + StrUtil.padPre(String.valueOf(temp+1),4, '0');
111 tblOrderForm.setOrderId(orderIdNew); 117 tblOrderForm.setOrderId(orderIdNew);
112 //任务下达日期 118 //任务下达日期
113 tblOrderForm.setOrderDate(new Date()); 119 tblOrderForm.setOrderDate(new Date());
@@ -99,6 +99,9 @@ public class OrderForm implements Serializable { @@ -99,6 +99,9 @@ public class OrderForm implements Serializable {
99 private String pics; 99 private String pics;
100 100
101 private String files; 101 private String files;
  102 + private String designPic;
  103 +
  104 + private String designFile;
102 105
103 private List<TblBiddingShenq> biddingSqList; 106 private List<TblBiddingShenq> biddingSqList;
104 /**收货图片*/ 107 /**收货图片*/
@@ -27,5 +27,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> { @@ -27,5 +27,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
27 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm); 27 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
28 28
29 Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm); 29 Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
  30 + Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
30 31
31 } 32 }
@@ -80,4 +80,30 @@ @@ -80,4 +80,30 @@
80 </if> 80 </if>
81 order by a.create_time desc 81 order by a.create_time desc
82 </select> 82 </select>
  83 + <select id="selectListDesign" resultType="org.jeecg.modules.erp.order_form.form.TblOrderFormModel">
  84 + SELECT
  85 + a.id,a.create_by,a.create_time,a.update_by,a.update_time,
  86 + 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,
  87 + 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,
  88 + a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1, d.design_pic as pics,d.design_file as files,a.pics2
  89 + FROM
  90 + tbl_order_form a
  91 + LEFT JOIN ( SELECT order_number, sum( work_hours ) dispatched_working_hours FROM tbl_production_gongxu GROUP BY order_number ) b ON a.order_id = b.order_number
  92 + left join tbl_product_type c on a.product_type = c.product_type_id
  93 + left join tbl_product_design d on a.order_id = d.order_id
  94 + where 1=1
  95 + <if test="qc.designer!=null and qc.designer !=''">
  96 + and a.designer like concat('%',#{qc.designer},'%')
  97 + </if>
  98 + <if test="qc.orderCompany!=null and qc.orderCompany !=''">
  99 + and a.order_company like concat('%',#{qc.orderCompany},'%')
  100 + </if>
  101 + <if test="qc.workOrder!=null and qc.workOrder !=''">
  102 + and a.work_order like concat('%',#{qc.workOrder},'%')
  103 + </if>
  104 + <if test="qc.productType!=null and qc.productType !=''">
  105 + and c.product_type_id like concat('%', #{qc.productType}, '%')
  106 + </if>
  107 + order by a.create_time desc
  108 + </select>
83 </mapper> 109 </mapper>
@@ -43,5 +43,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> { @@ -43,5 +43,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
43 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm); 43 Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
44 44
45 Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm); 45 Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
  46 + Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
46 47
47 } 48 }
@@ -75,5 +75,10 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl @@ -75,5 +75,10 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
75 return tblOrderFormMapper.selectList(page,tblOrderForm); 75 return tblOrderFormMapper.selectList(page,tblOrderForm);
76 } 76 }
77 77
  78 + @Override
  79 + public Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm) {
  80 + return tblOrderFormMapper.selectListDesign(page,tblOrderForm);
  81 + }
  82 +
78 83
79 } 84 }
@@ -96,7 +96,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh @@ -96,7 +96,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
96 96
97 String userNameByToken = JwtUtil.getUserNameByToken(req); 97 String userNameByToken = JwtUtil.getUserNameByToken(req);
98 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 98 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
99 - tblBiddingShenqApproval.setApproval(sysUser.getWorkNo()); 99 + tblBiddingShenqApproval.setApproval(userNameByToken);
100 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval); 100 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
101 101
102 //同意，更新采购申请审批状态为审批中 102 //同意，更新采购申请审批状态为审批中
@@ -117,7 +117,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh @@ -117,7 +117,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
117 117
118 String userNameByToken = JwtUtil.getUserNameByToken(req); 118 String userNameByToken = JwtUtil.getUserNameByToken(req);
119 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 119 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
120 - tblBiddingShenqApproval.setApproval(sysUser.getWorkNo()); 120 + tblBiddingShenqApproval.setApproval(userNameByToken);
121 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval); 121 tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
122 122
123 tblBiddingShenqService.updateapprovalStatusByOrderId("2",tblBiddingShenqApproval.getIsagree().equals("1") ? "1":"2",tblBiddingShenqApproval.getPartNumber()); 123 tblBiddingShenqService.updateapprovalStatusByOrderId("2",tblBiddingShenqApproval.getIsagree().equals("1") ? "1":"2",tblBiddingShenqApproval.getPartNumber());
@@ -40,7 +40,7 @@ public class BiddingSqController { @@ -40,7 +40,7 @@ public class BiddingSqController {
40 String userNameByToken = JwtUtil.getUserNameByToken(req); 40 String userNameByToken = JwtUtil.getUserNameByToken(req);
41 List<String> roleList = sysUserService.getRole(userNameByToken); 41 List<String> roleList = sysUserService.getRole(userNameByToken);
42 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 42 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
43 - biddingShenqForm.setApplicant(sysUser.getWorkNo()); 43 + biddingShenqForm.setApplicant(userNameByToken);
44 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize); 44 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
45 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm); 45 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
46 return Result.OK(pageList); 46 return Result.OK(pageList);
@@ -56,7 +56,7 @@ public class BiddingSqController { @@ -56,7 +56,7 @@ public class BiddingSqController {
56 String userNameByToken = JwtUtil.getUserNameByToken(req); 56 String userNameByToken = JwtUtil.getUserNameByToken(req);
57 List<String> roleList = sysUserService.getRole(userNameByToken); 57 List<String> roleList = sysUserService.getRole(userNameByToken);
58 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 58 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
59 - biddingShenqForm.setApplicant(sysUser.getWorkNo()); 59 + biddingShenqForm.setApplicant(userNameByToken);
60 biddingShenqForm.setApprovalStatus("0");//待审批 60 biddingShenqForm.setApprovalStatus("0");//待审批
61 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize); 61 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
62 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm); 62 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
@@ -73,7 +73,7 @@ public class BiddingSqController { @@ -73,7 +73,7 @@ public class BiddingSqController {
73 String userNameByToken = JwtUtil.getUserNameByToken(req); 73 String userNameByToken = JwtUtil.getUserNameByToken(req);
74 List<String> roleList = sysUserService.getRole(userNameByToken); 74 List<String> roleList = sysUserService.getRole(userNameByToken);
75 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 75 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
76 - biddingShenqForm.setApplicant(sysUser.getWorkNo()); 76 + biddingShenqForm.setApplicant(userNameByToken);
77 biddingShenqForm.setApprovalStatus("1");//审批中 77 biddingShenqForm.setApprovalStatus("1");//审批中
78 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize); 78 Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
79 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm); 79 IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
@@ -58,20 +58,21 @@ public class ProductDesignController { @@ -58,20 +58,21 @@ public class ProductDesignController {
58 String userNameByToken = JwtUtil.getUserNameByToken(req); 58 String userNameByToken = JwtUtil.getUserNameByToken(req);
59 // List<String> roleList = sysUserService.getRole(userNameByToken); 59 // List<String> roleList = sysUserService.getRole(userNameByToken);
60 SysUser sysUser = sysUserService.getUserByName(userNameByToken); 60 SysUser sysUser = sysUserService.getUserByName(userNameByToken);
61 - tblOrderForm.setDesigner(sysUser.getWorkNo()); 61 + tblOrderForm.setDesigner(userNameByToken);
62 // QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap()); 62 // QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
63 // queryWrapper.eq("designer", sysUser.getWorkNo()); 63 // queryWrapper.eq("designer", sysUser.getWorkNo());
64 Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize); 64 Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
65 - IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page, tblOrderForm); 65 + IPage<TblOrderFormModel> pageList = tblOrderFormService.selectListDesign(page, tblOrderForm);
66 return Result.OK(pageList); 66 return Result.OK(pageList);
67 } 67 }
68 68
69 // 分派设计人员 69 // 分派设计人员
70 @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST}) 70 @RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
71 - public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) { 71 + public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm, HttpServletRequest req) {
72 // tblOrderForm.setAssignDesignDate(new Date()); 72 // tblOrderForm.setAssignDesignDate(new Date());
73 tblOrderForm.setAssignDesignStatus("1"); 73 tblOrderForm.setAssignDesignStatus("1");
74 - tblOrderForm.setDesigner(sysUserService.selectByroleCodeUsername(tblOrderForm.getDesignRole(),tblOrderForm.getDesigner())); 74 + String userNameByToken = JwtUtil.getUserNameByToken(req);
  75 + tblOrderForm.setDesigner(userNameByToken);
75 tblOrderFormService.updateDesignerByOrderId(tblOrderForm); 76 tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
76 return Result.OK("分派成功!"); 77 return Result.OK("分派成功!");
77 } 78 }
@@ -94,13 +95,14 @@ public class ProductDesignController { @@ -94,13 +95,14 @@ public class ProductDesignController {
94 //保存产品设计 95 //保存产品设计
95 TblProductDesign tblProductDesign = new TblProductDesign(); 96 TblProductDesign tblProductDesign = new TblProductDesign();
96 tblProductDesign.setOrderId(tblOrderForm.getOrderId()); 97 tblProductDesign.setOrderId(tblOrderForm.getOrderId());
97 - tblProductDesign.setDesignPic(tblOrderForm.getPics());  
98 - tblProductDesign.setDesignFile(tblOrderForm.getFiles()); 98 + tblProductDesign.setDesignPic(tblOrderForm.getDesignPic());
  99 + tblProductDesign.setDesignFile(tblOrderForm.getDesignFile());
99 tblProductDesignService.save(tblProductDesign); 100 tblProductDesignService.save(tblProductDesign);
100 //批量保存材料及外购件 101 //批量保存材料及外购件
101 List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList(); 102 List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
102 for (TblBiddingShenq biddingShenq:biddingSqList){ 103 for (TblBiddingShenq biddingShenq:biddingSqList){
103 - biddingShenq.setApplicant(sysUser.getWorkNo()); 104 + biddingShenq.setOrderId(tblOrderForm.getOrderId());
  105 + biddingShenq.setApplicant(userNameByToken);
104 biddingShenq.setSqTime(new Date()); 106 biddingShenq.setSqTime(new Date());
105 } 107 }
106 tblBiddingShenqService.saveBatch(biddingSqList); 108 tblBiddingShenqService.saveBatch(biddingSqList);
@@ -132,7 +134,8 @@ public class ProductDesignController { @@ -132,7 +134,8 @@ public class ProductDesignController {
132 //批量保存材料及外购件 134 //批量保存材料及外购件
133 List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList(); 135 List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
134 for (TblBiddingShenq biddingShenq:biddingSqList){ 136 for (TblBiddingShenq biddingShenq:biddingSqList){
135 - biddingShenq.setApplicant(sysUser.getWorkNo()); 137 + biddingShenq.setOrderId(tblOrderForm.getOrderId());
  138 + biddingShenq.setApplicant(userNameByToken);
136 biddingShenq.setSqTime(new Date()); 139 biddingShenq.setSqTime(new Date());
137 } 140 }
138 tblBiddingShenqService.saveBatch(biddingSqList); 141 tblBiddingShenqService.saveBatch(biddingSqList);
@@ -142,8 +145,8 @@ public class ProductDesignController { @@ -142,8 +145,8 @@ public class ProductDesignController {
142 //前端处理把产品设计的id传给生产订单id 145 //前端处理把产品设计的id传给生产订单id
143 tblProductDesign.setId(tblOrderForm.getId()); 146 tblProductDesign.setId(tblOrderForm.getId());
144 tblProductDesign.setOrderId(tblOrderForm.getOrderId()); 147 tblProductDesign.setOrderId(tblOrderForm.getOrderId());
145 - tblProductDesign.setDesignPic(tblOrderForm.getPics());  
146 - tblProductDesign.setDesignFile(tblOrderForm.getFiles()); 148 + tblProductDesign.setDesignPic(tblOrderForm.getDesignPic());
  149 + tblProductDesign.setDesignFile(tblOrderForm.getDesignFile());
147 tblProductDesignService.updateById(tblProductDesign); 150 tblProductDesignService.updateById(tblProductDesign);
148 // tblProductDesignService.updateByOrderId(tblProductDesign); 151 // tblProductDesignService.updateByOrderId(tblProductDesign);
149 return Result.OK("编辑成功!"); 152 return Result.OK("编辑成功!");