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

优化

Browse Source
This commit is contained in:
zds
2022-12-27 17:23:42 +08:00
parent f1a9ffd218
commit 05c1ee55a7
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/DailyplanServiceImpl.java
View File

@@ -416,7 +416,6 @@ public class DailyplanServiceImpl implements DailyplanService {
new_jo.put("qty_unit_id",jo.getString("weight_unit_id"));
new_jo.put("qty_unit_name",jo.getString("weight_unit_name"));
new_jo.put("workorder_qty",jo.getString("standard_weight"));
new_jo.put("planstart_time",jo.getString("planstart_date").substring(0,10)+" 08:00:00");
new_jo.put("planend_time",jo.getString("planend_date").substring(0,10)+" 23:59:59");
new_jo.put("remark",jsonMst.getString("remark"));
@@ -428,6 +427,7 @@ public class DailyplanServiceImpl implements DailyplanService {
new_jo.put("org_id",jo.getString("org_id"));
new_jo.put("is_experiment","0");
new_jo.put("send_date",jsonMst.get("send_date"));
new_jo.put("is_out",ObjectUtil.isNotEmpty(new_jo.get("send_date"))?"1":"0");
workOrdereService.create(new_jo);
}

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/statistics/service/impl/IvtQueryServiceImpl.java
View File

@@ -158,6 +158,18 @@ public class IvtQueryServiceImpl implements IvtQueryService {
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < rows.size(); i++) {
JSONObject jo = rows.getJSONObject(i);
JSONObject jo2 = WQL.getWO("Qivt_query_02").addParam("flag","1")
.addParam("storagevehicle_code",jo.getString("storagevehicle_code"))
.addParam("is_active",jo.getString("is_active"))
.addParam("ivt_level",jo.getString("ivt_level"))
.addParam("quality_scode",jo.getString("quality_scode"))
.addParam("pcsn",jo.getString("pcsn"))
.addParam("material_id",jo.getString("material_id")).process().uniqueResult(0);
if(jo2!=null){
jo.put("bucket_num",jo2.getDouble("bucket_num"));
}else{
jo.put("bucket_num","0");
}
Map<String, Object> dtl_map = new LinkedHashMap<>();
dtl_map.put("仓库", jo.getString("stor_name"));
dtl_map.put("库区", jo.getString("sect_name"));

10
mes/qd/src/views/wms/pdm/produce/workorder/ViewDialog.vue
View File

@@ -70,11 +70,11 @@
<el-form-item label="发货日期" prop="send_date">
<el-date-picker disabled v-model="form.send_date" value-format="yyyy-MM-dd" type="date" style="width: 210px" />
</el-form-item>
<!-- <el-form-item label="是否外协" prop="is_out">-->
<!-- <label slot="label">是否外协:</label>-->
<!-- <el-radio v-model="form.is_out" label="1" disabled>是</el-radio>-->
<!-- <el-radio v-model="form.is_out" label="0" disabled>否</el-radio>-->
<!-- </el-form-item>-->
<el-form-item label="是否外协" prop="is_out">
<label slot="label">是否外协:</label>
<el-radio v-model="form.is_out" label="1" disabled>是</el-radio>
<el-radio v-model="form.is_out" label="0" disabled>否</el-radio>
- </el-form-item>
<el-form-item label="生产批次" prop="pcsn">
<label slot="label">生产批次:</label>
<el-input v-model.trim="form.pcsn" style="width: 210px" disabled />