diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerRespVO.java index 4211cbe2..bdaa135d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerRespVO.java @@ -23,6 +23,10 @@ public class CustomerRespVO { @ExcelProperty("客户编码") private String code; + @Schema(description = "客户代码", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("客户代码") + private String custCode; + @Schema(description = "简码", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("简码") private String brief; @@ -155,5 +159,4 @@ public class CustomerRespVO { @Schema(description = "公司税号") @ExcelProperty("公司税号") private String taxNo; - -} \ No newline at end of file +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerSaveReqVO.java index a07f4a81..f4f4c6fe 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/customer/vo/CustomerSaveReqVO.java @@ -21,9 +21,13 @@ public class CustomerSaveReqVO { private String brief; @Schema(description = "客户简称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") - @NotEmpty(message = "客户简称不能为空") + @NotBlank(message = "客户简称不能为空") private String name; + @Schema(description = "客户代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "客户代码不能为空") + private String custCode; + @Schema(description = "客户全称", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") @NotEmpty(message = "客户全称不能为空") private String fullName; @@ -107,4 +111,7 @@ public class CustomerSaveReqVO { @Schema(description = "公司税号") private String taxNo; + @Schema(description = "税率") + private Integer taxRate; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java index aa257f67..2a8c8c4e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderRespVO.java @@ -254,4 +254,8 @@ public class ProjectOrderRespVO { @ExcelProperty("六次付款 保留四位小数") private LocalDateTime sixFuKuanTime; + @Schema(description = "辅助项") + @ExcelProperty("辅助项") + private String auItem; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java index e2173ee1..d837a275 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/projectorder/vo/ProjectOrderSaveReqVO.java @@ -197,4 +197,7 @@ public class ProjectOrderSaveReqVO { @Schema(description = "六次付款时间") private LocalDateTime sixFuKuanTime; + @Schema(description = "辅助项") + private String auItem; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java index 1dafb639..7add8ecf 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java @@ -114,4 +114,10 @@ public class StorageRespVO { @ExcelProperty("即入即出标志 1 是:0不是") private Boolean inOutFlag; + + // 供应商信息 + private Long supplierId; + private String brief; + private String name; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java index eca538ec..decf4794 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java @@ -87,4 +87,6 @@ public class StorageSaveReqVO { private Boolean inOutFlag; + private Long supplierId; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierRespVO.java index fa7e3943..a89ccaf2 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierRespVO.java @@ -158,4 +158,8 @@ public class SupplierRespVO { @ExcelProperty("公司税号") private String taxNo; -} \ No newline at end of file + @Schema(description = "税率") + @ExcelProperty("税率") + private String taxRate; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierSaveReqVO.java index b6ea21e9..3e8b1613 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/supplier/vo/SupplierSaveReqVO.java @@ -106,4 +106,7 @@ public class SupplierSaveReqVO { @Schema(description = "公司税号") private String taxNo; + @Schema(description = "税率") + private Integer taxRate; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/customer/CustomerDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/customer/CustomerDO.java index f61ff545..e989ccb7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/customer/CustomerDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/customer/CustomerDO.java @@ -31,6 +31,8 @@ public class CustomerDO extends BaseDO { * 客户编码 */ private String code; + + private String custCode; /** * 简码 */ @@ -153,4 +155,6 @@ public class CustomerDO extends BaseDO { */ private String taxNo; + private Integer taxRate; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java index d5571fdd..9f50cce0 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderDO.java @@ -316,6 +316,8 @@ public class ProjectOrderDO extends BaseDO { @TableField(exist = false) private Set alterFieldNames; + private String auItem; + public boolean canSave(){ return this.orderStatus.intValue() <= ProjectOrderStatusEnum.SAVE.getCode(); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java index 5bc882df..78257605 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java @@ -148,4 +148,9 @@ public class StorageDO extends BaseDO { private Long headerId; @TableField(exist = false) private String type; + + // 供应商信息 + private Long supplierId; + private String brief; + private String name; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/supplier/SupplierDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/supplier/SupplierDO.java index b450895a..c8107e93 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/supplier/SupplierDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/supplier/SupplierDO.java @@ -153,4 +153,6 @@ public class SupplierDO extends BaseDO { */ private String taxNo; + private Integer taxRate; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java index 36de36c7..b7a609d9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storage/StorageServiceImpl.java @@ -14,6 +14,7 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.storageinventory.Storag import com.chanko.yunxi.mes.module.heli.controller.admin.storagemat.vo.StorageMatSaveReqVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.bdgzsomthing.bdgzsomthingDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.deliverorder.DeliverOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.material.MaterialDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestock.OutsourceStockDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.outsourcestockboom.OutsourceStockBoomDO; @@ -26,8 +27,10 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.storageinventory.StorageI import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelog.StorageLogDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagelogNow.StorageLogNowDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.storagemat.StorageMatDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.supplier.SupplierDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.warehouse.WarehouseDO; import com.chanko.yunxi.mes.module.heli.dal.mysql.composition.CompositionMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.deliverorder.DeliverOrderMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.master.MasterMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.material.MaterialMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.outsourcestock.OutsourceStockMapper; @@ -40,6 +43,7 @@ import com.chanko.yunxi.mes.module.heli.dal.mysql.storageinventory.StorageInvent import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storagelog.StorageLogNowMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.storagemat.StorageMatMapper; +import com.chanko.yunxi.mes.module.heli.dal.mysql.supplier.SupplierMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.warehouse.WarehouseMapper; import com.chanko.yunxi.mes.module.heli.enums.BusinesTypeEnum; import com.chanko.yunxi.mes.module.heli.enums.CodeEnum; @@ -135,8 +139,11 @@ public class StorageServiceImpl implements StorageService { @Resource private PnMapper pnMapper; -@Resource -private StorageLogService storageLogService; + @Resource + private SupplierMapper supplierMapper; + + @Resource + private StorageLogService storageLogService; /* * * 委外验收取消提交,作废入库单 @@ -442,6 +449,16 @@ private StorageLogService storageLogService; } // 更新 StorageDO updateObj = BeanUtils.toBean(updateReqVO, StorageDO.class); + + //根据供应商ID查询供应商信息 + if (updateReqVO.getSupplierId() != null) { + SupplierDO supplierDO = supplierMapper.selectById(updateReqVO.getSupplierId()); + if (supplierDO != null) { + updateObj.setName(supplierDO.getName()); + updateObj.setSupplierId(supplierDO.getId()); + updateObj.setBrief(supplierDO.getBrief()); + } + } storageMapper.updateById(updateObj); } @Override diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts index d1bba66b..62dc69a4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/customer/index.ts @@ -33,6 +33,7 @@ export interface CustomerVO { bankNo: string bankAddress: string taxNo: string + custCode: string } // 查询客户新表分页 diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts index da93e03a..153a9584 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/storage/index.ts @@ -19,6 +19,8 @@ export interface StorageVO { pickmode: string pickmcar: string projectSubName: string + supplierId: number + name: string } // 查询入/出库分页 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue index 384e48ac..db5d1544 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue @@ -40,6 +40,13 @@ + + + + + + + @@ -385,6 +392,7 @@ const formData = ref({ bankNo: undefined, bankAddress: undefined, taxNo: undefined, + custCode: undefined, attachments: [], operateLogs: [], alterFieldNames: [], @@ -667,7 +675,8 @@ const resetForm = () => { attachments: [], operateLogs: [], alterFieldNames: [], - taxNo: undefined + taxNo: undefined, + custCode: undefined } formRef.value?.resetFields() } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/index.vue index f58d45c5..52c50cbc 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/index.vue @@ -85,6 +85,7 @@ +