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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
liuxy
2022-11-16 09:22:15 +08:00
parent 01cc33b59d 052a2fa7e6
commit 422416faba
11 changed files with 64 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/EmptyVehicleServiceImpl.java
View File

@@ -60,9 +60,11 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
}
if (option.equals("0")){
point_jo.put("empty_vehicle_code","");
point_jo.put("empty_point_status","01");
}
if (option.equals("1")){
point_jo.put("empty_vehicle_code",vehicle_code);
point_jo.put("empty_point_status","02");
}
WQLObject.getWQLObject("st_ivt_coolpointivt").update(point_jo);
JSONObject jo = new JSONObject();

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CoolPointIvtServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class CoolPointIvtServiceImpl implements CoolPointIvtService {
map.put("is_used", whereJson.get("is_used"));
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("ST_IVT_COOLPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code");
return json;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/CutPointIvtServiceImpl.java
View File

@@ -45,7 +45,7 @@ public Map<String,Object> queryAll(Map whereJson, Pageable page){
map.put("empty_point_status", whereJson.get("empty_point_status"));
map.put("product_area", whereJson.get("product_area"));
map.put("is_used", whereJson.get("is_used"));
JSONObject json = WQL.getWO("ST_IVT_CUTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("ST_IVT_CUTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code");
return json;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/DeliveryPointIvtServiceImpl.java
View File

@@ -43,7 +43,7 @@ public Map<String,Object> queryAll(Map whereJson, Pageable page){
map.put("product_area", whereJson.get("product_area"));
map.put("point_status", whereJson.get("point_status"));
map.put("is_used", whereJson.get("is_used"));
JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("ST_IVT_DELIVERYPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code");
return json;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/HotPointIvtServiceImpl.java
View File

@@ -48,7 +48,7 @@ public class HotPointIvtServiceImpl implements HotPointIvtService {
map.put("begin_time", whereJson.get("begin_time"));
map.put("end_time", whereJson.get("end_time"));
JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("ST_IVT_HOTPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,group_name,point_code");
return json;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java
View File

@@ -42,7 +42,7 @@ public class SbPointIvtServiceImpl implements SbPointIvtService {
map.put("point_code", "%" + whereJson.get("point_code") + "%");
map.put("product_area", whereJson.get("product_area"));
map.put("is_used", whereJson.get("is_used"));
JSONObject json = WQL.getWO("ST_IVT_SBPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "update_time desc");
JSONObject json = WQL.getWO("ST_IVT_SBPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code");
return json;
}

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/RawfoilworkorderServiceImpl.java
View File

@@ -56,7 +56,7 @@ public class RawfoilworkorderServiceImpl implements RawfoilworkorderService {
map.put("product_area",product_area);
map.put("status",status);
JSONObject json = WQL.getWO("PDM_BI_RAWFOILWORKORDER_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "der.update_time DESC");
JSONObject json = WQL.getWO("PDM_BI_RAWFOILWORKORDER_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "der.container_name");
return json;
}

11
lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java
View File

@@ -61,7 +61,7 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%");
if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%");
JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.update_time DESC");
JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.container_name");
return json;
}
@@ -108,9 +108,14 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
dto.setUpdate_time(now);
dto.setCreate_time(now);
JSONObject jo = (JSONObject) JSON.toJSON(dto);
jo.put("status", "01");
jo.put("is_parent_ok", "0");
jo.put("is_child_tz_ok", "0");
jo.put("is_child_ps_ok", "0");
jo.put("is_delete", "0");
WQLObject wo = WQLObject.getWQLObject("pdm_bi_slittingproductionplan");
JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
wo.insert(json);
wo.insert(jo);
}
@Override

12
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
View File

@@ -60,12 +60,6 @@
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="满轴位编码" prop="full_point_code">
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true"/>
</el-form-item>
@@ -87,6 +81,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-select
v-model="form.empty_point_status"
@@ -103,6 +100,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="库存状态" prop="cool_ivt_status">
<el-select
v-model="form.cool_ivt_status"

12
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -131,12 +131,6 @@
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="满轴位编码" prop="full_point_code">
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
</el-form-item>
@@ -158,6 +152,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="空轴位状态" prop="empty_point_status">
<el-select
v-model="form.empty_point_status"
@@ -174,6 +171,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="空轴编码">
<el-input v-model="form.empty_vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="库存状态" prop="cool_ivt_status">
<el-select
v-model="form.cool_ivt_status"

42
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -156,6 +156,9 @@
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="订单类型" prop="order_type">
<el-input v-model="form.order_type" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item>
@@ -165,22 +168,49 @@
<el-form-item label="产品描述" prop="description">
<el-input v-model="form.description" style="width: 370px;" />
</el-form-item>
<el-form-item label="来源母卷号" prop="parent_container_name">
<el-input v-model="form.parent_container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="改制来源子卷号" prop="restruct_container_name">
<el-input v-model="form.restruct_container_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷立库木箱号" prop="package_box_sn">
<el-input v-model="form.package_box_sn" style="width: 370px;" />
</el-form-item>
<el-form-item label="来源卷位置" prop="ware_house">
<el-input v-model="form.ware_house" style="width: 370px;" />
</el-form-item>
<el-form-item label="分切机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料编码">
<el-form-item label="分切组" prop="split_group">
<el-input v-model="form.split_group" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产顺序" prop="manufacture_sort">
<el-input v-model="form.manufacture_sort" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产订单" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 370px;" />
</el-form-item>
<el-form-item label="生产日期" prop="manufacture_date">
<el-input v-model="form.manufacture_date" style="width: 370px;" />
</el-form-item>
<el-form-item label="管件类型" prop="paper_tube_or_FRP">
<el-input v-model="form.paper_tube_or_FRP" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料编码" prop="paper_tube_material">
<el-input v-model="form.paper_tube_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="纸筒物料描述">
<el-form-item label="纸筒物料描述" prop="paper_tube_description">
<el-input v-model="form.paper_tube_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料编码">
<el-form-item label="FRP管物料编码" prop="FRP_material">
<el-input v-model="form.FRP_material" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管物料描述">
<el-form-item label="FRP管物料描述" prop="FRP_description">
<el-input v-model="form.FRP_description" style="width: 370px;" />
</el-form-item>
<el-form-item label="FRP管规格">
<el-form-item label="FRP管规格" prop="FRP_model">
<el-input v-model="form.FRP_model" style="width: 370px;" />
</el-form-item>
<el-form-item label="子卷幅宽" prop="split_breadth">
@@ -314,7 +344,7 @@ export default {
sort: 'workorder_id,desc',
crudMethod: { ...crudSlittingproductionplan },
optShow: {
add: false,
add: true,
edit: false,
del: false,
download: false,