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

rev:库存预警、预警消息

Browse Source
This commit is contained in:
gengby
2024-05-27 15:36:27 +08:00
parent 92a9210dfe
commit 3ea8988711
20 changed files with 890 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/.idea/sonarlint/issuestore/4/0/400fbf00a1743bc1972994d7dffce150f50044f7 generated
View File

@@ -1,4 +0,0 @@
u java:S116"[Rename this field "local_table_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(<28>ֵ<EFBFBD><D6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<EFBFBD>
java:S1128"dRemove this unused import 'org.nl.wms.base_manage.field_mapping.service.dao.BmExternalFieldMapping'.(<28><><EFBFBD><EFBFBD>8<><38><EFBFBD><EFBFBD><EFBFBD>1

3
wms_pro/hd/.idea/sonarlint/issuestore/8/9/89eeb13258719f34694cb541337f127c3bcaeda1 generated
View File

@@ -1,3 +0,0 @@
G
java:S1602B",Remove useless curly braces around statement(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

50
wms_pro/hd/.idea/sonarlint/issuestore/index.pb generated
View File

@@ -27,10 +27,6 @@ gnladmin-system/src/main/java/org/nl/wms/system_manage/service/coderule/impl/Sys
lnladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java,1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b
_
/nladmin-system/src/main/java/org/nl/AppRun.java,1/0/10e40d67bd7d0818c5483704f020703d1bef8378
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java,4/0/400fbf00a1743bc1972994d7dffce150f50044f7
<EFBFBD>
anladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java,8/9/89eeb13258719f34694cb541337f127c3bcaeda1
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/base_manage/supplier/service/dao/mapper/BmSupplierMapper.java,8/5/85dbedfade54927efe168608601c3aefd87bec15
<EFBFBD>
@@ -137,8 +133,6 @@ unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/process/node
Xnladmin-system/src/main/java/org/nl/wms/external_system/acs/service/WmsToAcsService.java,2/0/20d3f5ca66f748f0a2bada36023b0308d4d552c0
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/IActRuExecutionService.java,6/c/6cccbeca1a92061e0584fff09e8c598223b372a6
<EFBFBD>
nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09
<EFBFBD>
onladmin-system/src/main/java/org/nl/wms/base_manage/class_standard/service/impl/BmClassStandardServiceImpl.java,b/1/b140d08f0cb476ebc6fa39caddd1c7f4819af4c3
<EFBFBD>
@@ -185,8 +179,6 @@ gnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/
Wnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java,6/b/6b1cc623ef87736e8a936dc1ca0c0b2c653fb82a
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/execution/ExecutionController.java,0/e/0e30069a5751c50d7cf828ec3c27e091f8565818
<EFBFBD>
cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/config/InitFlowConfig.java,7/5/758c32dcd4ffc4e615e513ba6feb54def23e084a
<EFBFBD>
@@ -214,4 +206,44 @@ cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/converter/Bp
w
Gnladmin-system/src/main/java/org/nl/common/domain/entity/BaseQuery.java,f/0/f062b578de11e2952654784226f11bae7019cd76
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java,c/8/c82a62a04d41331b300a120923e2949be6b68bb3
[nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrQuery.java,c/8/c82a62a04d41331b300a120923e2949be6b68bb3
<EFBFBD>
dnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java,a/b/abf5637a5a0d3b1f78e4a21306cffd484e9011f5
<EFBFBD>
gnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java,2/4/244e466911a3a496e08587100bdf062fd7e13ed4
<EFBFBD>
hnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/StIvtStructattrMapper.java,f/9/f94bd5c2e5469d880023b16729b09dca7eccdca4
<EFBFBD>
[nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/StIvtStructattr.java,e/5/e584c062454e373b331c75c111b2fd6543e9c6dc
<EFBFBD>
_nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java,b/1/b10dff3efd70a39f23a25125ca4669d404c03bbb
<EFBFBD>
knladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml,d/3/d3143bfeb3b1a633f41056e1c3d660d3ac2e1b14
u
Enladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java,d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java,4/a/4a2188ff934d5838c3361cc66d54b717f4ae8b43
p
@nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java,d/a/da2cfc661b6ccefab91ec1ba98461be21c19e65a
<EFBFBD>
\nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java,3/a/3a80eecf978aec3f47fcfb62925c4e9bc24bd471
<EFBFBD>
enladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java,d/7/d75ac1c2c3c2e5ce56355f91aecccc4dc7b58e4d
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/ISchBaseTaskService.java,9/d/9d0436677d004c5ce485ddbb8f4ba57bf9efe393
<EFBFBD>
fnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/SchBaseTaskMapper.java,b/5/b5c97852157076b62f277a89f3a91de547e658b9
<EFBFBD>
inladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml,8/2/82abf35a15b6b99c49b8bff42ed7d48ae3c35782
<EFBFBD>
^nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dto/SchBaseTaskQuery.java,5/1/51a4fbcc58b8b420ef22a116990b3cb695ed46fe
<EFBFBD>
Ynladmin-system/src/main/java/org/nl/wms/dispatch_manage/dispatch/TaskDispatchService.java,5/6/56270e92dcf49eabaa4b489e407879d7891295f6
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java,f/f/ff212f1da42fe37170690dbb3fde617bd6d4ea4d
<EFBFBD>
]nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/AgvTaskHandler.java,4/8/48d893d6babffa6fbccdae11c1603e05cc0d1140
<EFBFBD>
bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java,c/a/caa59130099a147acf733a484dae55badb122e24
<EFBFBD>
`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml
View File

@@ -19,6 +19,7 @@
<select id="getStor" resultType="com.alibaba.fastjson.JSONObject">
SELECT
CONVERT(stor_id , CHAR ) AS stor_id,
stor_code,
stor_name
FROM
st_ivt_bsrealstorattr

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java
View File

@@ -14,13 +14,11 @@ import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
public class MaterialQuery extends BaseQuery<MdMeMaterialbase> {
private String local_table_name;
private String search;
@Override
public void paramMapping() {
super.doP.put("local_table_name", QParam.builder().k(new String[]{"local_table_name"}).type(QueryTEnum.EQ).build());
super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build());
super.doP.put("search", QParam.builder().k(new String[]{"material_code","material_name"}).type(QueryTEnum.EQ).build());
}

32
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
View File

@@ -1,9 +1,19 @@
package org.nl.wms.early_manage.controller.early_msg;
import org.springframework.web.bind.annotation.RequestMapping;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.early_manage.service.early_inv.dao.AlmEarlyInv;
import org.nl.wms.early_manage.service.early_msg.IAlmEarlyMsgService;
import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
import org.nl.wms.early_manage.service.early_msg.dto.AlmMsgQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RestController;
import java.util.Arrays;
/**
* <p>
@@ -18,7 +28,23 @@ import org.springframework.web.bind.annotation.RestController;
>>>>>>> 4d92078988aaae9ca50b029b3d3f00ded39a2bfc:wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java
*/
@RestController
@RequestMapping("/almEarlyMsg")
@RequestMapping("/api/almEarlyMsg")
public class AlmEarlyMsgController {
@Autowired
private IAlmEarlyMsgService almEarlyMsgService;
@GetMapping
public ResponseEntity<Object> getAll(AlmMsgQuery query, PageQuery page) {
return new ResponseEntity<>(almEarlyMsgService.getAll(page,query), HttpStatus.OK);
}
@DeleteMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length > 0) {
almEarlyMsgService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
}

85
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/inv_early/AlmEarlyInvController.java
View File

@@ -2,13 +2,21 @@ package org.nl.wms.early_manage.controller.inv_early;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.base_manage.material.service.dto.MaterialQuery;
import org.nl.wms.early_manage.service.early_dtl.IAlmEarlyDtlService;
import org.nl.wms.early_manage.service.early_dtl.dao.AlmEarlyDtl;
import org.nl.wms.early_manage.service.early_dtl.dto.AlmDtlQuery;
import org.nl.wms.early_manage.service.early_inv.IAlmEarlyInvService;
import org.nl.wms.early_manage.service.early_inv.dao.AlmEarlyInv;
@@ -19,16 +27,19 @@ import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
订单：1000
生产订单：1000
150--------------------------
| |
|---300 150 150 150 第一天
400 第二天
300 第三天
import java.util.Arrays;
import java.util.List;
/**
* 订单：1000
* 生产订单：1000
* 150--------------------------
* | |
* |---300 150 150 150 第一天
* 400 第二天
* 300 第三天
**/
**/
/**
* <p>
* 安全库存报警配置表 前端控制器
@@ -45,17 +56,37 @@ public class AlmEarlyInvController {
private IAlmEarlyInvService iAlmEarlyInvService;
@Autowired
private IAlmEarlyDtlService iAlmEarlyDtlService;
@Autowired
private IMdMeMaterialbaseService materialbaseService;
@GetMapping
public ResponseEntity<Object> getAll(AlmInvQuery query, PageQuery page) {
Page<AlmEarlyInv> page1 = iAlmEarlyInvService.page(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(iAlmEarlyInvService.page(page.build(), query.build())), HttpStatus.OK);
}
@GetMapping("/dtl")
public ResponseEntity<Object> getDtl(AlmDtlQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iAlmEarlyDtlService.page(page.build(),query.build())), HttpStatus.OK);
return new ResponseEntity<>(TableDataInfo.build(iAlmEarlyDtlService.page(page.build(), query.build())), HttpStatus.OK);
}
@GetMapping("/dtl/{id}")
public ResponseEntity<Object> getDtl(@PathVariable String id) {
List<AlmEarlyDtl> list = iAlmEarlyDtlService.list(new LambdaQueryWrapper<AlmEarlyDtl>().eq(AlmEarlyDtl::getAlm_id, id));
JSONArray array = new JSONArray();
for (AlmEarlyDtl almEarlyDtl : list) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("alm_id", almEarlyDtl.getAlm_id());
jsonObject.put("material_id", almEarlyDtl.getMaterial_id());
MdMeMaterialbase materialbase = materialbaseService.getById(almEarlyDtl.getMaterial_id());
jsonObject.put("material_code", materialbase.getMaterial_code());
jsonObject.put("material_name", materialbase.getMaterial_name());
jsonObject.put("material_spec", materialbase.getMaterial_spec());
jsonObject.put("material_model", materialbase.getMaterial_model());
array.add(jsonObject);
}
return new ResponseEntity<>(array, HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> create(@Validated @RequestBody JSONObject dto) {
@@ -66,5 +97,39 @@ public class AlmEarlyInvController {
iAlmEarlyInvService.save(inv);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/update")
public ResponseEntity<Object> update(@Validated @RequestBody JSONObject dto) {
AlmEarlyInv inv = dto.toJavaObject(AlmEarlyInv.class);
inv.setCreate_time(DateUtil.now());
iAlmEarlyInvService.updateById(inv);
return new ResponseEntity<>(HttpStatus.CREATED);
}
@PostMapping("/saveDtl")
public ResponseEntity<Object> saveDtl(@Validated @RequestBody JSONObject dto) {
String id = dto.getString("id");
LambdaUpdateWrapper<AlmEarlyDtl> luw = new LambdaUpdateWrapper<>();
luw.eq(AlmEarlyDtl::getAlm_id, id);
iAlmEarlyDtlService.remove(luw);
JSONArray jsonArray = dto.getJSONArray("tableData");
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
String material_id = jsonObject.getString("material_id");
AlmEarlyDtl almEarlyDtl = new AlmEarlyDtl();
almEarlyDtl.setAlm_id(id);
almEarlyDtl.setMaterial_id(material_id);
iAlmEarlyDtlService.save(almEarlyDtl);
}
return new ResponseEntity<>(HttpStatus.CREATED);
}
@DeleteMapping("/delete")
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length > 0) {
iAlmEarlyInvService.removeByIds(Arrays.asList(ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dto/AlmInvQuery.java
View File

@@ -16,7 +16,7 @@ public class AlmInvQuery extends BaseQuery<AlmEarlyInv> {
@Override
public void paramMapping() {
super.doP.put("search", QParam.builder().k(new String[]{"local_field_name", "external_field_name"}).type(QueryTEnum.EQ).build());
super.doP.put("search", QParam.builder().k(new String[]{"alm_name"}).type(QueryTEnum.EQ).build());
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/IAlmEarlyMsgService.java
View File

@@ -1,7 +1,9 @@
package org.nl.wms.early_manage.service.early_msg;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.early_manage.service.early_msg.dto.AlmMsgQuery;
/**
* <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface IAlmEarlyMsgService extends IService<AlmEarlyMsg> {
Object getAll(PageQuery page, AlmMsgQuery query);
}

30
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dto/AlmMsgQuery.java Normal file
View File

@@ -0,0 +1,30 @@
package org.nl.wms.early_manage.service.early_msg.dto;
import lombok.Data;
import org.nl.common.domain.entity.BaseQuery;
import org.nl.common.domain.entity.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
/*
* @author ZZQ
* @Date 2023/5/4 19:49
*/
@Data
public class AlmMsgQuery extends BaseQuery<AlmEarlyMsg> {
private String early_type;
private String stor_code;
private String vehicle_code;
private String material_code;
@Override
public void paramMapping() {
super.doP.put("early_type", QParam.builder().k(new String[]{"early_type"}).type(QueryTEnum.EQ).build());
super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.EQ).build());
super.doP.put("vehicle_code", QParam.builder().k(new String[]{"vehicle_code"}).type(QueryTEnum.LK).build());
super.doP.put("material_code", QParam.builder().k(new String[]{"material_code"}).type(QueryTEnum.LK).build());
}
}

39
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java
View File

@@ -1,11 +1,25 @@
package org.nl.wms.early_manage.service.early_msg.impl;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg;
import org.nl.wms.early_manage.service.early_msg.dao.mapper.AlmEarlyMsgMapper;
import org.nl.wms.early_manage.service.early_msg.IAlmEarlyMsgService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.early_manage.service.early_msg.dto.AlmMsgQuery;
import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* <p>
* 仓库报警消息表 服务实现类
@@ -17,4 +31,29 @@ import org.springframework.stereotype.Service;
@Service
public class AlmEarlyMsgServiceImpl extends ServiceImpl<AlmEarlyMsgMapper, AlmEarlyMsg> implements IAlmEarlyMsgService {
@Autowired
private IMdMeMaterialbaseService materialbaseService;
@Override
public Object getAll(PageQuery page, AlmMsgQuery query) {
// totalElements
// content
//判断是否存在子实例
Page<AlmEarlyMsg> almMsgQueryPage = this.page(page.build(), query.build());
long total = almMsgQueryPage.getTotal();
List<AlmEarlyMsg> records = almMsgQueryPage.getRecords();
JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(records));
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
MdMeMaterialbase material = materialbaseService.getById(jsonObject.getString("material_id"));
if (ObjectUtil.isNotEmpty(material)){
jsonObject.put("material_code",material.getMaterial_code());
jsonObject.put("material_name",material.getMaterial_name());
}
}
JSONObject json = new JSONObject();
json.put("totalElements",total);
json.put("content",jsonArray);
return json;
}
}