From 76abc64d46442c889986f05774f4939f56b335f2 Mon Sep 17 00:00:00 2001 From: "CJYXTX\\27961" <971623072tx> Date: Wed, 6 Mar 2024 15:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=A7=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehousingInventoryProductEntity.java | 3 + .../WarehousingReceiveProductEntity.java | 2 + .../WarehousingReportlossProductEntity.java | 3 + .../WarehousingReturnProductEntity.java | 2 + .../java/jnpf/entity/WorkOrderEntity.java | 2 + .../jnpf/entity/WorkOrderPrimaryEntity.java | 3 + .../jnpf/entity/WorkOrderProductEntity.java | 3 + .../warehousinginventory/columnList.js | 2 +- .../warehousing/warehousinginventory/form.vue | 219 ++++++----- .../warehousinginventory/superQueryJson.js | 2 +- .../warehousing/warehousingreceive/form.vue | 217 +++++----- .../warehousingreceive/superQueryJson.js | 2 +- .../warehousingreportloss/form.vue | 198 +++++----- .../warehousing/warehousingreturn/form.vue | 191 ++++----- .../src/views/scm/workorder/columnList.js | 2 +- .../jnpf-web/src/views/scm/workorder/form.vue | 371 +++++++++++------- .../src/views/scm/workorder/index.vue | 53 ++- .../src/views/scm/workorder/superQueryJson.js | 2 +- 18 files changed, 711 insertions(+), 566 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java index 900dfbe4..9ebe95ff 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingInventoryProductEntity.java @@ -72,4 +72,7 @@ public class WarehousingInventoryProductEntity { private String companyId; @TableField("DEPARTMENT_ID") private String departmentId; + + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java index b1161570..b2112f0a 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReceiveProductEntity.java @@ -53,4 +53,6 @@ public class WarehousingReceiveProductEntity { private String companyId; @TableField("DEPARTMENT_ID") private String departmentId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java index 0936a8b4..8eec6cff 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReportlossProductEntity.java @@ -51,4 +51,7 @@ public class WarehousingReportlossProductEntity { private String companyId; @TableField("DEPARTMENT_ID") private String departmentId; + + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java index 01a78b31..54a6958f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingReturnProductEntity.java @@ -53,4 +53,6 @@ public class WarehousingReturnProductEntity { private String companyId; @TableField("DEPARTMENT_ID") private String departmentId; + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java index 27d73427..d6f386fd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderEntity.java @@ -73,5 +73,7 @@ public class WorkOrderEntity { @TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED) private Integer deleteMark; + @TableField(value = "WAREHOUSING_ID" , updateStrategy = FieldStrategy.IGNORED) + private String warehousingId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java index e678c8dc..a2d6bb4d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderPrimaryEntity.java @@ -42,4 +42,7 @@ public class WorkOrderPrimaryEntity { private String tenantId; @TableField("WORK_ID") private String workId; + + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java index 1fefb29b..fd24466f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java @@ -47,4 +47,7 @@ public class WorkOrderProductEntity { private String tenantId; @TableField("WORK_ID") private String workId; + + @TableField(value = "CARGO_ID" , updateStrategy = FieldStrategy.IGNORED) + private String cargoId; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/columnList.js b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/columnList.js index 4f070bb5..32f62aac 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/columnList.js @@ -1,2 +1,2 @@ -const columnList = [{"border":false,"jnpfKey":"radio","fullName":"业务类型","label":"业务类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"业务类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496416660,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"inventoryType","width":0,"options":[{"fullName":"日常盘点单","id":"1"},{"fullName":"业务盘点单","id":"2"}],"__vModel__":"inventoryType","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"inventoryType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"popupType":"dialog","hasPage":true,"pageSize":20,"columnOptions":[{"label":"仓库名称","value":"name"},{"label":"仓库编码","value":"code"}],"align":"left","templateJson":[],"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"仓库名称","trigger":"change","showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496464080,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":12},"prop":"warehouseId","__vModel__":"warehouseId","disabled":false,"id":"warehouseId","placeholder":"请选择","interfaceName":"入库单-查询仓库","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"仓库名称","label":"仓库名称","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"529617754022498181","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"盘点开始时间","label":"盘点开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"labelWidth":120,"showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496576063,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"盘点开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":12},"readonly":false,"prop":"inventoryTimeStart","width":0,"__vModel__":"inventoryTimeStart","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"inventoryTimeStart","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"jnpfKey":"billRule","fullName":"单据编号","label":"单据编号","sortable":false,"align":"left","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"warehousingInventory","className":[],"label":"单据编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708496592525,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"库存盘点单","tag":"JnpfInput","span":24},"readonly":true,"prop":"documentNo","width":0,"__vModel__":"documentNo","fixed":"none","style":{"width":"100%"},"id":"documentNo","placeholder":"系统自动生成"},{"jnpfKey":"createUser","fullName":"创建用户","label":"创建用户","sortable":false,"align":"left","type":"currUser","__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497163004,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorUserId","width":0,"__vModel__":"creatorUserId","fixed":"none","style":{"width":"100%"},"id":"creatorUserId","placeholder":""},{"jnpfKey":"createTime","fullName":"创建时间","label":"创建时间","sortable":false,"align":"left","type":"currTime","__config__":{"formId":116,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建时间","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497165434,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"id":"creatorTime","placeholder":""},{"jnpfKey":"modifyUser","fullName":"修改用户","label":"修改用户","sortable":false,"align":"left","__config__":{"formId":117,"visibility":["pc","app"],"jnpfKey":"modifyUser","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改用户","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497167200,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifier","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyUserId","width":0,"__vModel__":"lastModifyUserId","fixed":"none","style":{"width":"100%"},"id":"lastModifyUserId","placeholder":"系统自动生成"},{"jnpfKey":"modifyTime","fullName":"修改时间","label":"修改时间","sortable":false,"align":"left","__config__":{"formId":118,"visibility":["pc","app"],"jnpfKey":"modifyTime","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改时间","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497168618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifytime","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyTime","width":0,"__vModel__":"lastModifyTime","fixed":"none","style":{"width":"100%"},"id":"lastModifyTime","placeholder":"系统自动生成"}] +const columnList = [{"border":false,"jnpfKey":"radio","fullName":"业务类型","label":"业务类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"optionType":"default","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"radio","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"业务类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496416660,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-radio","propsName":"","tag":"JnpfRadio","regList":[],"span":24},"size":"small","prop":"inventoryType","width":0,"options":[{"fullName":"日常盘点单","id":"1"},{"fullName":"业务盘点单","id":"2"}],"__vModel__":"inventoryType","fixed":"none","style":{},"disabled":false,"interfaceHasPage":false,"id":"inventoryType","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"direction":"horizontal"},{"popupType":"dialog","hasPage":true,"pageSize":20,"columnOptions":[{"label":"仓库名称","value":"name"},{"label":"仓库编码","value":"code"}],"align":"left","templateJson":[],"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"522748594453754053","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"仓库名称","trigger":"change","showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496464080,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":12},"prop":"warehouseId","__vModel__":"warehouseId","disabled":false,"id":"warehouseId","placeholder":"请选择","interfaceName":"入库单-查询仓库","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"仓库名称","label":"仓库名称","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"529617754022498181","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"盘点开始时间","label":"盘点开始时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"labelWidth":120,"showLabel":true,"required":true,"tableName":"jg_warehousing_inventory","renderKey":1708496576063,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"盘点开始时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":12},"readonly":false,"prop":"inventoryTimeStart","width":0,"__vModel__":"inventoryTimeStart","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"inventoryTimeStart","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"jnpfKey":"billRule","fullName":"单据编号","label":"单据编号","sortable":false,"align":"left","__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"warehousingInventory","className":[],"label":"单据编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708496592525,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"库存盘点单","tag":"JnpfInput","span":24},"readonly":true,"prop":"documentNo","width":0,"__vModel__":"documentNo","fixed":"none","style":{"width":"100%"},"id":"documentNo","placeholder":"系统自动生成"},{"jnpfKey":"createUser","fullName":"创建用户","label":"创建用户","sortable":false,"align":"left","type":"currUser","__config__":{"formId":115,"visibility":["pc","app"],"jnpfKey":"createUser","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建用户","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497163004,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-founder","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorUserId","width":0,"__vModel__":"creatorUserId","fixed":"none","style":{"width":"100%"},"id":"creatorUserId","placeholder":""},{"jnpfKey":"createTime","fullName":"创建时间","label":"创建时间","sortable":false,"align":"left","type":"currTime","__config__":{"formId":116,"visibility":["pc","app"],"jnpfKey":"createTime","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"创建时间","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497165434,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-createtime","tag":"JnpfOpenData","span":24},"readonly":true,"prop":"creatorTime","width":0,"__vModel__":"creatorTime","fixed":"none","style":{"width":"100%"},"id":"creatorTime","placeholder":""},{"jnpfKey":"modifyUser","fullName":"修改用户","label":"修改用户","sortable":false,"align":"left","__config__":{"formId":117,"visibility":["pc","app"],"jnpfKey":"modifyUser","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改用户","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497167200,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifier","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyUserId","width":0,"__vModel__":"lastModifyUserId","fixed":"none","style":{"width":"100%"},"id":"lastModifyUserId","placeholder":"系统自动生成"},{"jnpfKey":"modifyTime","fullName":"修改时间","label":"修改时间","sortable":false,"align":"left","__config__":{"formId":118,"visibility":["pc","app"],"jnpfKey":"modifyTime","defaultValue":"","noShow":true,"tipLabel":"","dragDisabled":false,"className":[],"label":"修改时间","showLabel":true,"required":false,"tableName":"jg_warehousing_inventory","renderKey":1708497168618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-modifytime","tag":"JnpfInput","span":24},"readonly":true,"prop":"lastModifyTime","width":0,"__vModel__":"lastModifyTime","fixed":"none","style":{"width":"100%"},"id":"lastModifyTime","placeholder":"系统自动生成"}] export default columnList \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue index 6c95bb85..d5ed65ce 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousinginventory/form.vue @@ -1,12 +1,8 @@ - - - - -