root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-27 14:46:29 +08:00
parent c91b7238e0
commit 137fed8a19
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/pdm/bi/service/impl/SubpackagerelationServiceImpl.java
View File

@@ -3,6 +3,7 @@ package org.nl.wms.pdm.bi.service.impl;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.exception.BadRequestException;
@@ -136,6 +137,11 @@ public class SubpackagerelationServiceImpl implements SubpackagerelationService
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); WQLObject wo = WQLObject.getWQLObject("pdm_bi_subpackagerelation");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
//判断包装关系状态，只能修改状态为生成的
String status = json.getString("status");
if (!StrUtil.equals(status,"0")){
throw new BadRequestException("只能修改状态为生成的包装关系！");
}
wo.update(json); wo.update(json);
} }

12
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java
View File

@@ -18,7 +18,7 @@ import java.util.Map;
@RestController @RestController
@RequiredArgsConstructor @RequiredArgsConstructor
@Api(tags = "PC端原辅料入库") @Api(tags = "PC端入库")
@RequestMapping("/api/in/rawAssist") @RequestMapping("/api/in/rawAssist")
@Slf4j @Slf4j
public class RawAssistIStorController { public class RawAssistIStorController {
@@ -27,8 +27,8 @@ public class RawAssistIStorController {
private RawAssistIStorService rawAssistIStorService; private RawAssistIStorService rawAssistIStorService;
@GetMapping @GetMapping
@Log("查询原辅料入库单据") @Log("查询入库单据")
@ApiOperation("查询原辅料入库单据") @ApiOperation("查询入库单据")
//@PreAuthorize("@el.check('checkoutbill:list')") //@PreAuthorize("@el.check('checkoutbill:list')")
public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) { public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(rawAssistIStorService.pageQuery(whereJson, page), HttpStatus.OK); return new ResponseEntity<>(rawAssistIStorService.pageQuery(whereJson, page), HttpStatus.OK);
@@ -44,8 +44,8 @@ public class RawAssistIStorController {
} }
@GetMapping("/getBillDtl") @GetMapping("/getBillDtl")
@Log("查询到货通知单") @Log("查询入库单来源")
@ApiOperation("查询到货通知单") @ApiOperation("查询入库单来源")
//@PreAuthorize("@el.check('materialtype:list')") //@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> getBillDtl(@RequestParam Map whereJson, Pageable page) { public ResponseEntity<Object> getBillDtl(@RequestParam Map whereJson, Pageable page) {
return new ResponseEntity<>(rawAssistIStorService.getBillDtl(whereJson, page), HttpStatus.OK); return new ResponseEntity<>(rawAssistIStorService.getBillDtl(whereJson, page), HttpStatus.OK);
@@ -114,7 +114,7 @@ public class RawAssistIStorController {
@PostMapping("/divPoint") @PostMapping("/divPoint")
@Log("设置起点") @Log("设置起点")
@ApiOperation("分配货位") @ApiOperation("设置起点")
//@PreAuthorize("@el.check('materialtype:list')") //@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> divPoint(@RequestBody Map whereJson) { public ResponseEntity<Object> divPoint(@RequestBody Map whereJson) {
rawAssistIStorService.divPoint(whereJson); rawAssistIStorService.divPoint(whereJson);