雷海东 / factory-java · 提交

转到一个项目

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

生产订单

内嵌 并排对比
正在显示 9 个修改的文件 包含 61 行增加 和 16 行删除
... ... @@ -107,7 +107,13 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
String type = tblOrderForm.getProductType() + DateUtil.format(new Date(), "YYYYMM");
String orderId = tblOrderFormService.getCountByType(type);
log.info("订单编号："+ orderId);
String orderIdNew= type + StrUtil.padPre(String.valueOf(Integer.valueOf(orderId.substring(8))+1),4, '0');
Integer temp = null;
if(StrUtil.isBlank(orderId)){
temp = 0;
}else{
temp =Integer.valueOf(orderId.substring(8));
}
String orderIdNew= type + StrUtil.padPre(String.valueOf(temp+1),4, '0');
tblOrderForm.setOrderId(orderIdNew);
//任务下达日期
tblOrderForm.setOrderDate(new Date());
... ...
... ... @@ -99,6 +99,9 @@ public class OrderForm implements Serializable {
private String pics;
private String files;
private String designPic;
private String designFile;
private List<TblBiddingShenq> biddingSqList;
/**收货图片*/
... ...
... ... @@ -27,5 +27,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
}
... ...
... ... @@ -80,4 +80,30 @@
</if>
order by a.create_time desc
</select>
<select id="selectListDesign" resultType="org.jeecg.modules.erp.order_form.form.TblOrderFormModel">
SELECT
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 ,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.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
FROM
tbl_order_form a
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
left join tbl_product_type c on a.product_type = c.product_type_id
left join tbl_product_design d on a.order_id = d.order_id
where 1=1
<if test="qc.designer!=null and qc.designer !=''">
and a.designer like concat('%',#{qc.designer},'%')
</if>
<if test="qc.orderCompany!=null and qc.orderCompany !=''">
and a.order_company like concat('%',#{qc.orderCompany},'%')
</if>
<if test="qc.workOrder!=null and qc.workOrder !=''">
and a.work_order like concat('%',#{qc.workOrder},'%')
</if>
<if test="qc.productType!=null and qc.productType !=''">
and c.product_type_id like concat('%', #{qc.productType}, '%')
</if>
order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
... ...
... ... @@ -43,5 +43,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
}
... ...
... ... @@ -75,5 +75,10 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
return tblOrderFormMapper.selectList(page,tblOrderForm);
}
@Override
public Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm) {
return tblOrderFormMapper.selectListDesign(page,tblOrderForm);
}
}
... ...
... ... @@ -96,7 +96,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
String userNameByToken = JwtUtil.getUserNameByToken(req);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
tblBiddingShenqApproval.setApproval(userNameByToken);
tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
//同意，更新采购申请审批状态为审批中
... ... @@ -117,7 +117,7 @@ public class BiddingShenqApprovalController extends JeecgController<TblBiddingSh
String userNameByToken = JwtUtil.getUserNameByToken(req);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
tblBiddingShenqApproval.setApproval(sysUser.getWorkNo());
tblBiddingShenqApproval.setApproval(userNameByToken);
tblBiddingShenqApprovalService.save(tblBiddingShenqApproval);
tblBiddingShenqService.updateapprovalStatusByOrderId("2",tblBiddingShenqApproval.getIsagree().equals("1") ? "1":"2",tblBiddingShenqApproval.getPartNumber());
... ...
... ... @@ -40,7 +40,7 @@ public class BiddingSqController {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
biddingShenqForm.setApplicant(sysUser.getWorkNo());
biddingShenqForm.setApplicant(userNameByToken);
Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
return Result.OK(pageList);
... ... @@ -56,7 +56,7 @@ public class BiddingSqController {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
biddingShenqForm.setApplicant(sysUser.getWorkNo());
biddingShenqForm.setApplicant(userNameByToken);
biddingShenqForm.setApprovalStatus("0");//待审批
Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
... ... @@ -73,7 +73,7 @@ public class BiddingSqController {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
biddingShenqForm.setApplicant(sysUser.getWorkNo());
biddingShenqForm.setApplicant(userNameByToken);
biddingShenqForm.setApprovalStatus("1");//审批中
Page<BiddingShenqForm> page = new Page<BiddingShenqForm>(pageNo, pageSize);
IPage<BiddingShenqForm> pageList = tblBiddingShenqService.selectList(page, biddingShenqForm);
... ...
... ... @@ -58,20 +58,21 @@ public class ProductDesignController {
String userNameByToken = JwtUtil.getUserNameByToken(req);
// List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
tblOrderForm.setDesigner(sysUser.getWorkNo());
tblOrderForm.setDesigner(userNameByToken);
// QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
// queryWrapper.eq("designer", sysUser.getWorkNo());
Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
IPage<TblOrderFormModel> pageList = tblOrderFormService.selectList(page, tblOrderForm);
IPage<TblOrderFormModel> pageList = tblOrderFormService.selectListDesign(page, tblOrderForm);
return Result.OK(pageList);
}
// 分派设计人员
@RequestMapping(value = "/updateDesigner", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm) {
public Result<String> updateDesigner(@RequestBody TblOrderForm tblOrderForm, HttpServletRequest req) {
// tblOrderForm.setAssignDesignDate(new Date());
tblOrderForm.setAssignDesignStatus("1");
tblOrderForm.setDesigner(sysUserService.selectByroleCodeUsername(tblOrderForm.getDesignRole(),tblOrderForm.getDesigner()));
String userNameByToken = JwtUtil.getUserNameByToken(req);
tblOrderForm.setDesigner(userNameByToken);
tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
return Result.OK("分派成功!");
}
... ... @@ -94,13 +95,14 @@ public class ProductDesignController {
//保存产品设计
TblProductDesign tblProductDesign = new TblProductDesign();
tblProductDesign.setOrderId(tblOrderForm.getOrderId());
tblProductDesign.setDesignPic(tblOrderForm.getPics());
tblProductDesign.setDesignFile(tblOrderForm.getFiles());
tblProductDesign.setDesignPic(tblOrderForm.getDesignPic());
tblProductDesign.setDesignFile(tblOrderForm.getDesignFile());
tblProductDesignService.save(tblProductDesign);
//批量保存材料及外购件
List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
for (TblBiddingShenq biddingShenq:biddingSqList){
biddingShenq.setApplicant(sysUser.getWorkNo());
biddingShenq.setOrderId(tblOrderForm.getOrderId());
biddingShenq.setApplicant(userNameByToken);
biddingShenq.setSqTime(new Date());
}
tblBiddingShenqService.saveBatch(biddingSqList);
... ... @@ -132,7 +134,8 @@ public class ProductDesignController {
//批量保存材料及外购件
List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
for (TblBiddingShenq biddingShenq:biddingSqList){
biddingShenq.setApplicant(sysUser.getWorkNo());
biddingShenq.setOrderId(tblOrderForm.getOrderId());
biddingShenq.setApplicant(userNameByToken);
biddingShenq.setSqTime(new Date());
}
tblBiddingShenqService.saveBatch(biddingSqList);
... ... @@ -142,8 +145,8 @@ public class ProductDesignController {
//前端处理把产品设计的id传给生产订单id
tblProductDesign.setId(tblOrderForm.getId());
tblProductDesign.setOrderId(tblOrderForm.getOrderId());
tblProductDesign.setDesignPic(tblOrderForm.getPics());
tblProductDesign.setDesignFile(tblOrderForm.getFiles());
tblProductDesign.setDesignPic(tblOrderForm.getDesignPic());
tblProductDesign.setDesignFile(tblOrderForm.getDesignFile());
tblProductDesignService.updateById(tblProductDesign);
// tblProductDesignService.updateByOrderId(tblProductDesign);
return Result.OK("编辑成功!");
... ...