diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
index 5c363f8a3..fdf94978d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductInstorServiceImpl.java
@@ -179,6 +179,11 @@ public class ProductInstorServiceImpl implements ProductInstorService {
form.put("task_type", "010507");
cutConveyorTask.createTask(form);
} else {
+ JSONArray now_dis_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "18").addParam("box_no", map.get("box_no")).process().getResultJSONArray(0);
+ if (now_dis_rows.size() > 0) {
+ throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
+ }
+
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
//直接分配虚拟区货位，并确认
JSONObject struct = WQL.getWO("PDA_ST_01").addParam("flag", "3").addParam("stor_id",stor.getString("stor_id")).process().uniqueResult(0);
diff --git a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
index d64639c27..cc21488a1 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
@@ -162,7 +162,7 @@
/>
-->
-
+
@@ -179,192 +179,196 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -375,72 +379,94 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ dict.label.sub_package_relation[scope.row.status] }}
-
-
-
+
+
+
{{ dict.label.IS_OR_NOT[scope.row.is_un_plan_production] }}
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{ dict.label.IS_OR_NOT[scope.row.isreprintpackageboxlabel] }}
-
+
{{ dict.label.IS_OR_NOT[scope.row.isunpackbox] }}
-
-
-
+
+
+
-
+
@@ -455,14 +481,55 @@ import pagination from '@crud/Pagination'
import { download } from '@/api/data'
import { downloadFile } from '@/utils'
-const defaultForm = { workorder_id: null, package_box_sn: null, quanlity_in_box: null, box_weight: null, quality_guaran_period: null, sale_order_name: null, customer_name: null, customer_description: null, product_name: null, product_description: null, date_of_fg_inbound: null, container_name: null, width: null, thickness: null, mass_per_unit_area: null, net_weight: null, length: null, date_of_production: null, is_un_plan_production: null, un_plan_product_property1: null, un_plan_product_property2: null, un_plan_product_property3: null, box_type: null, sap_pcsn: null, remark: null, create_id: null, create_name: null, create_time: null, status: null, isreprintpackageboxlabel: null, isunpackbox: null, thickness_request: null, width_standard: null }
+const defaultForm = {
+ workorder_id: null,
+ package_box_sn: null,
+ quanlity_in_box: null,
+ box_weight: null,
+ quality_guaran_period: null,
+ sale_order_name: null,
+ customer_name: null,
+ customer_description: null,
+ product_name: null,
+ product_description: null,
+ date_of_fg_inbound: null,
+ container_name: null,
+ width: null,
+ thickness: null,
+ mass_per_unit_area: null,
+ net_weight: null,
+ length: null,
+ date_of_production: null,
+ is_un_plan_production: null,
+ un_plan_product_property1: null,
+ un_plan_product_property2: null,
+ un_plan_product_property3: null,
+ box_type: null,
+ sap_pcsn: null,
+ remark: null,
+ create_id: null,
+ create_name: null,
+ create_time: null,
+ status: null,
+ isreprintpackageboxlabel: null,
+ isunpackbox: null,
+ thickness_request: null,
+ width_standard: null
+}
export default {
name: 'Subpackagerelation',
dicts: ['sub_package_relation', 'IS_OR_NOT'],
components: { pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
- return CRUD({ title: '子卷包装关系', url: 'api/subpackagerelation', idField: 'workorder_id', sort: 'workorder_id,desc', crudMethod: { ...crudSubpackagerelation }})
+ return CRUD({
+ title: '子卷包装关系',
+ optShow: { add: true, edit: false, del: false },
+ url: 'api/subpackagerelation',
+ idField: 'workorder_id',
+ sort: 'workorder_id,desc',
+ crudMethod: { ...crudSubpackagerelation }
+ })
},
data() {
return {
@@ -475,6 +542,7 @@ export default {
{ 'label': '是', 'value': '1' },
{ 'label': '否', 'value': '0' }
],
+
rules: {
customer_description: [
{ required: true, message: '客户名称不能为空', trigger: 'blur' }
@@ -539,7 +607,8 @@ export default {
status: [
{ required: true, message: '状态不能为空', trigger: 'blur' }
]
- }}
+ }
+ }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据