fix: 打印唛头检测工单对应的客户信息
This commit is contained in:
@@ -515,6 +515,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
|
|||||||
log.info("包装数据:{}", object);
|
log.info("包装数据:{}", object);
|
||||||
String custerNo = object.getString("custer_no");
|
String custerNo = object.getString("custer_no");
|
||||||
String orderNo = object.getString("order_no");
|
String orderNo = object.getString("order_no");
|
||||||
|
if (ObjectUtil.isEmpty(custerNo)) {
|
||||||
|
throw new BadRequestException("客户编码不能为空");
|
||||||
|
}
|
||||||
|
if (ObjectUtil.isEmpty(orderNo)) {
|
||||||
|
throw new BadRequestException("订单号不能为空");
|
||||||
|
}
|
||||||
CusterDo custer;
|
CusterDo custer;
|
||||||
// 都是数据就是id,否则就是名称
|
// 都是数据就是id,否则就是名称
|
||||||
if (custerNo.matches("\\d+")) {
|
if (custerNo.matches("\\d+")) {
|
||||||
|
|||||||
@@ -155,6 +155,15 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
|
|||||||
if (dto == null) {
|
if (dto == null) {
|
||||||
throw new BadRequestException("被删除或无权限,操作失败!");
|
throw new BadRequestException("被删除或无权限,操作失败!");
|
||||||
}
|
}
|
||||||
|
SchBasePoint point = pointService.getById(entity.getPoint_code());
|
||||||
|
if (GeneralDefinition.AREA_FJ.equals(entity.getRegion_code())
|
||||||
|
&& !"6".equals(point.getPoint_type())) {
|
||||||
|
// 工单号和客户编码存放json
|
||||||
|
JSONObject res = new JSONObject();
|
||||||
|
res.put("order_no", entity.getOrder_no());
|
||||||
|
res.put("custer_no", entity.getCuster_no());
|
||||||
|
entity.setExt_data(res.toJSONString());
|
||||||
|
}
|
||||||
// 使用最新的状态
|
// 使用最新的状态
|
||||||
entity.setWorkorder_status(dto.getWorkorder_status());
|
entity.setWorkorder_status(dto.getWorkorder_status());
|
||||||
entity.setUpdate_id(GeneralDefinition.ACS_ID);
|
entity.setUpdate_id(GeneralDefinition.ACS_ID);
|
||||||
|
|||||||
@@ -607,6 +607,7 @@ export default {
|
|||||||
const ext = JSON.parse(extData)
|
const ext = JSON.parse(extData)
|
||||||
this.form.order_no = ext.order_no
|
this.form.order_no = ext.order_no
|
||||||
this.form.order_subnum = ext.custer_no
|
this.form.order_subnum = ext.custer_no
|
||||||
|
this.form.custer_no = ext.custer_no
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
getWorkShopList() { // 获取车间列表
|
getWorkShopList() { // 获取车间列表
|
||||||
|
|||||||
Reference in New Issue
Block a user