diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java index 6f74601..fac86c0 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java @@ -82,4 +82,11 @@ public class BomCallMaterialController { return new ResponseEntity<>(iPdmBomCallMaterialService.queryMaterialBom(whereJson), HttpStatus.OK); } + @PostMapping("/receiveConfirm") + @Log("添加领料人") + public ResponseEntity receiveConfirm(@RequestBody PdmBomCallMaterial dao) { + iPdmBomCallMaterialService.receiveConfirm(dao); + return new ResponseEntity<>(HttpStatus.CREATED); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java index a3b01b3..1c4539f 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java @@ -88,4 +88,10 @@ public interface IPdmBomCallMaterialService extends IService * @return List */ List queryMaterialBom(JSONObject whereJson); + + /** + * 添加领导人 + * @param dao 实体类 + */ + void receiveConfirm(PdmBomCallMaterial dao); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java index ea52385..1e9d484 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java @@ -115,4 +115,9 @@ public class PdmBomCallMaterial implements Serializable { */ private String point_code; + /** + * 领料人 + */ + private String receive_name; + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java index a3fd7d3..1bc5064 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java @@ -166,4 +166,10 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + 保存 + 关闭 + + + + + + + + + + + + + + diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js index 7512334..caff0d4 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/callmaterial.js @@ -48,4 +48,12 @@ export function queryMaterialBom(data) { }) } -export default { add, edit, del, confirm, startBom, queryMaterialBom } +export function receiveConfirm(data) { + return request({ + url: 'api/bomCallMaterial/receiveConfirm', + method: 'post', + data + }) +} + +export default { add, edit, del, confirm, startBom, queryMaterialBom, receiveConfirm } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue index 1a4617c..38f23ba 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue @@ -96,6 +96,17 @@ + + 填写领料人 + + @@ -294,12 +306,14 @@ +