雷海东 / factory-java · 提交

转到一个项目

作者 张晓杰
提交 e31677ae22e8bc28efbb90d619aca8a2fcd46105 1 个父辈 174acfac

产品设计修改追加申请人

内嵌 并排对比
正在显示 4 个修改的文件 包含 94 行增加 和 19 行删除
... ... @@ -110,10 +110,10 @@ public class TblBiddingShenq implements Serializable {
@ApiModelProperty(value = "备注")
private String notes;
/**申请人角色*/
@Excel(name = "申请人角色", width = 15)
@ApiModelProperty(value = "申请人角色")
private String applyRole;
// /**申请人角色*/
// @Excel(name = "申请人角色", width = 15)
// @ApiModelProperty(value = "申请人角色")
// private String applyRole;
/**申请人*/
@Excel(name = "申请人", width = 15)
... ...
... ... @@ -94,17 +94,7 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
for (TblOrderForm order : pageList.getRecords()) {
// 查询与订单号相关的数据
List<TblProductionPlan> productionGongxuList = planService.list(new QueryWrapper<TblProductionPlan>().eq("order_number", order.getOrderId()));
for (TblProductionPlan productionGongxu : productionGongxuList) {
order.setDispatchedWorkingHours(String.valueOf(productionGongxu.getPai()));
tblOrderFormService.updateById(order);
}
}
IPage<TblOrderForm> pageList = tblOrderFormService.selectList(page,tblOrderForm);
return Result.OK(pageList);
}
... ...
... ... @@ -69,9 +69,9 @@ public class TblOrderForm implements Serializable {
@ApiModelProperty(value = "产品名称")
private java.lang.String productName;
@Excel(name = "产品类型id", width = 15)
@ApiModelProperty(value = "产品类型id")
private java.lang.String productTypeId;
// @Excel(name = "产品类型id", width = 15)
// @ApiModelProperty(value = "产品类型id")
// private java.lang.String productTypeId;
@Excel(name = "产品类型", width = 15)
@ApiModelProperty(value = "产品类型")
... ...
... ... @@ -3,19 +3,27 @@ package org.jeecg.modules.api.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.erp.bidding_info.entity.TblBiddingShenq;
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.form.OrderForm;
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.service.ITblProductDesignService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
... ... @@ -32,6 +40,12 @@ public class ProductDesignController {
@Autowired
private ITblOrderFormService tblOrderFormService;
@Autowired
private ITblProductDesignService tblProductDesignService;
@Autowired
private ITblBiddingShenqService tblBiddingShenqService;
//产品设计订单列表
@GetMapping(value = "/productDesignList")
public Result<IPage<TblOrderForm>> getProductDesignList(TblOrderForm tblOrderForm,
... ... @@ -40,7 +54,7 @@ public class ProductDesignController {
HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
List<String> roleList = sysUserService.getRole(userNameByToken);
// List<String> roleList = sysUserService.getRole(userNameByToken);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
tblOrderForm.setDesigner(sysUser.getWorkNo());
// QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
... ... @@ -59,4 +73,75 @@ public class ProductDesignController {
tblOrderFormService.updateDesignerByOrderId(tblOrderForm);
return Result.OK("分派成功!");
}
/**
* 添加
*
* @param tblOrderForm
* @return
*/
@Transactional(rollbackFor = Exception.class)
@AutoLog(value = "产品设计图-添加")
@ApiOperation(value="产品设计图-添加", notes="产品设计图-添加")
@PostMapping(value = "/add")
public Result<String> add(@RequestBody OrderForm tblOrderForm,HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
//保存产品设计
TblProductDesign tblProductDesign = new TblProductDesign();
tblProductDesign.setOrderId(tblOrderForm.getOrderId());
tblProductDesign.setDesignPic(tblOrderForm.getPics());
tblProductDesign.setDesignFile(tblOrderForm.getFiles());
tblProductDesignService.save(tblProductDesign);
//批量保存材料及外购件
List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
for (TblBiddingShenq biddingShenq:biddingSqList){
biddingShenq.setApplicant(sysUser.getWorkNo());
}
tblBiddingShenqService.saveBatch(biddingSqList);
//更新生产订单表中产品设计状态
TblOrderForm tblOrderForm1 = new TblOrderForm();
tblOrderForm1.setProductDesignStatus("1");
tblOrderForm1.setOrderId(tblOrderForm.getOrderId());
tblOrderFormService.updateProductDesignStatusByOrderId(tblOrderForm1);
return Result.OK("添加成功！");
}
/**
* 编辑
*
* @param tblOrderForm
* @return
*/
@Transactional(rollbackFor = Exception.class)
@AutoLog(value = "产品设计图-编辑")
@ApiOperation(value="产品设计图-编辑", notes="产品设计图-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody OrderForm tblOrderForm,HttpServletRequest req) {
String userNameByToken = JwtUtil.getUserNameByToken(req);
SysUser sysUser = sysUserService.getUserByName(userNameByToken);
//删除材料及外购件
tblBiddingShenqService.deleteByOrdeId(tblOrderForm.getOrderId());
//批量保存材料及外购件
List<TblBiddingShenq> biddingSqList = tblOrderForm.getBiddingSqList();
for (TblBiddingShenq biddingShenq:biddingSqList){
biddingShenq.setApplicant(sysUser.getWorkNo());
}
tblBiddingShenqService.saveBatch(biddingSqList);
//保存产品设计
TblProductDesign tblProductDesign = new TblProductDesign();
//前端处理把产品设计的id传给生产订单id
tblProductDesign.setId(tblOrderForm.getId());
tblProductDesign.setOrderId(tblOrderForm.getOrderId());
tblProductDesign.setDesignPic(tblOrderForm.getPics());
tblProductDesign.setDesignFile(tblOrderForm.getFiles());
tblProductDesignService.updateById(tblProductDesign);
// tblProductDesignService.updateByOrderId(tblProductDesign);
return Result.OK("编辑成功!");
}
}
... ...