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

rev:贴标增加开关

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2024-01-12 14:36:24 +08:00
parent 8a864c7212
commit b4f25156c7
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -677,10 +677,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (ObjectUtil.isEmpty(jsonCust)) {
throw new BadRequestException("客户不存在请检查!");
}
JSONObject data = new JSONObject();
data.put("is_auto_table", jsonCust.getString("is_auto_table"));
//判断系统参数是否贴标
String is_labeling = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_labeling").getValue();
if (is_labeling.equals("0")){
//更新实际重量
HashMap<String, Object> map = new HashMap<>();
map.put("real_weight",weight);
WQLObject.getWQLObject("pdm_bi_subpackagerelation").update(map, "package_box_sn = '" + vehicle_code + "'");
data.put("is_auto_table", "0");
result.put("data", data);
return result;
}
// 判断是否贴标
if (!StrUtil.equals(jsonCust.getString("is_auto_table"), "1")) {
result.put("data", data);

1
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -520,6 +520,7 @@
<el-table-column prop="box_length" label="长" :min-width="flexWidth('box_length',crud.data,'长')" />
<el-table-column prop="box_width" label="宽" :min-width="flexWidth('box_width',crud.data,'宽')" />
<el-table-column prop="box_high" label="高" :min-width="flexWidth('box_high',crud.data,'高')" />
<el-table-column prop="real_weight" label="实际重量"/>
<el-table-column prop="demand_limit" label="客户需求抗拉下限" :min-width="flexWidth('demand_limit',crud.data,'客户需求抗拉下限')" />
<el-table-column prop="standard_limit" label="内控标准抗拉下限" :min-width="flexWidth('standard_limit',crud.data,'内控标准抗拉下限')" />
<el-table-column prop="actual_value" label="生产实际抗拉值" :min-width="flexWidth('actual_value',crud.data,'生产实际抗拉值')" />