Commit a3259f81 by ice

修改销售订单存在的小问题

parent 9dc958d4
...@@ -128,6 +128,7 @@ public class PurRequisitionController { ...@@ -128,6 +128,7 @@ public class PurRequisitionController {
**/ **/
@RequestMapping(path = "/add", method = RequestMethod.POST) @RequestMapping(path = "/add", method = RequestMethod.POST)
public Result add(@RequestBody PurRequisitionPage purRequisitionPage, public Result add(@RequestBody PurRequisitionPage purRequisitionPage,
@RequestParam(value = "token")String token,
@RequestParam(value = "headerStatus", required = false) String headerStatus) { @RequestParam(value = "headerStatus", required = false) String headerStatus) {
//判断想要下推生成采购申请单的状态是否为已审批 //判断想要下推生成采购申请单的状态是否为已审批
if (!"approval".equals(headerStatus) && !"completed".equals(headerStatus)) { if (!"approval".equals(headerStatus) && !"completed".equals(headerStatus)) {
...@@ -164,10 +165,12 @@ public class PurRequisitionController { ...@@ -164,10 +165,12 @@ public class PurRequisitionController {
} }
requisitionLine.setItemCode(invItem.getItemCode()); requisitionLine.setItemCode(invItem.getItemCode());
} }
SysAccessToken sysAccessToken = userServer.checkAccessToken(token);
PurRequisition purRequisition = new PurRequisition(); PurRequisition purRequisition = new PurRequisition();
BeanUtils.copyProperties(purRequisitionPage, purRequisition); BeanUtils.copyProperties(purRequisitionPage, purRequisition);
//为采购申请主表添加组织code //为采购申请主表添加组织code
purRequisition.setSysOrgCode(sysOrgCode); purRequisition.setSysOrgCode(sysOrgCode);
purRequisition.setApplicant(sysAccessToken.getUserId());
//添加 //添加
purRequisitionService.saveMain(purRequisition, purRequisitionPage.getPurRequisitionLineList()); purRequisitionService.saveMain(purRequisition, purRequisitionPage.getPurRequisitionLineList());
return new Result(true,StatusCode.OK,"下推采购申请成功!",purRequisitionPage.getOrderNumber()); return new Result(true,StatusCode.OK,"下推采购申请成功!",purRequisitionPage.getOrderNumber());
......
...@@ -74,7 +74,7 @@ public class WshShipmentController { ...@@ -74,7 +74,7 @@ public class WshShipmentController {
} }
String updateBy = user.getRealname(); String updateBy = user.getRealname();
LocalDateTime updateTime = LocalDateTime.now(); LocalDateTime updateTime = LocalDateTime.now();
wshShipmentHeaderPage.setShipperV(user.getPersonId()); wshShipmentHeaderPage.setShipperV(user.getId());
//查找出当前用户所在的组织sysorgcode //查找出当前用户所在的组织sysorgcode
Map<String,Object> map = getInfo(user.getPersonId()); Map<String,Object> map = getInfo(user.getPersonId());
//赋值当前用户的组织code //赋值当前用户的组织code
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment