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

add：三线包装工单

Browse Source
This commit is contained in:
zhangzhiqiang
2023-08-15 19:12:40 +08:00
parent 4bbaa58d36
commit aa54150593
7 changed files with 175 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/other/service/orderExt/dao/MpsSaleOrderIcExt.java
View File

@@ -31,6 +31,16 @@ public class MpsSaleOrderIcExt implements Serializable {
*/
private Integer seq_no;
/**
* print_序号
*/
private Integer print_no;
/**
* 物料规格
*/
private String material_code;
/**
* 包装袋类型
*/

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderIcExtController.java
View File

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.anno.Log;
import org.nl.wms.mps_manage.other.service.orderExt.IMpsSaleOrderIcExtService;
import org.nl.wms.mps_manage.other.service.orderExt.dao.MpsSaleOrderIcExt;
import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -28,6 +29,8 @@ public class MpsSaleOrderIcExtController {
@Autowired
private IMpsSaleOrderIcExtService extService;
@Autowired
private IPdmProduceWorkorderService workorderService;
@PostMapping
@Log("新增订单扩展表")
@@ -41,6 +44,15 @@ public class MpsSaleOrderIcExtController {
@Log("根据工单获取条码")
//("根据工单获取条码")
public ResponseEntity<Object> getExtList(@RequestBody JSONObject whereJson) {
String workorder_code = whereJson.getString("workorder_code");
MpsSaleOrderIcExt one = extService.getOne(new QueryWrapper<MpsSaleOrderIcExt>()
.eq("sale_id", whereJson.getString("sale_id")).eq("material_code", whereJson.getString("material_code")));
int print_no = 0;
if (one==null){
}else {
print_no = one.getPrint_no();
}
return new ResponseEntity<>(extService.list(new QueryWrapper<MpsSaleOrderIcExt>().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK);
}
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/user/impl/ISysUserServiceImpl.java
View File

@@ -112,7 +112,7 @@ public class ISysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> imp
@Override
@Transactional
public void update(Map userDetail) {
if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("userId")==null){
if(CollectionUtils.isEmpty(userDetail)|| userDetail.get("user_id")==null){
return;
}