From bc066482b97463752e2d8de0bda2302ec4a3377d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=86=E7=B1=B3=E8=8A=B1?= <417727563@qq.com>
Date: Tue, 18 Apr 2023 10:40:19 +0800
Subject: [PATCH] 2023-04-18-01-bug

---
 .../src/views/device/modules/ZyDeviceForm.vue |  6 +--
 .../erp/fabric/modules/ZyFabricTypeForm.vue   | 10 ++++-
 .../src/views/system/modules/DepartModal.vue  |  2 +-
 .../service/impl/ZyOrdersServiceImpl.java     | 38 ++++++++++++-------
 .../impl/ZyPlanProcessServiceImpl.java        | 19 +++++++---
 .../impl/ZyProductPlanServiceImpl.java        |  2 +-
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
index 37fd658a..e9ee3463 100644
--- a/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
+++ b/ant-design-vue-jeecg/src/views/device/modules/ZyDeviceForm.vue
@@ -77,8 +77,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="设备品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <j-dict-select-tag v-model="model.canshu" dictCode="zy_devicebrand,brand,id"
-                                 placeholder="设备品牌" @change="canshu"></j-dict-select-tag>
+              <j-dict-select-tag v-model="model.brandId" dictCode="zy_devicebrand,brand,id"
+                                 placeholder="设备品牌" ></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -161,7 +161,7 @@
     methods: {
       canshu(){
         this.parm1.brand_id=this.model.canshu
-        console.log(this.parm1)
+        // console.log(this.parm1)
       },
       add () {
         this.edit(this.modelDefault);
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
index ec14ee55..736c1a0c 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricTypeForm.vue
@@ -82,7 +82,15 @@
       add () {
         var n=4
         getAction(this.url.weiyi,{id:this.model.nums}).then((res)=>{
-          var num=parseInt(res.result,10)+1
+          var num="";
+          if(res.message!="")
+          {
+            num=parseInt(res.message,10)+1
+          }else
+          {
+            num="0001";
+          }
+          var num=parseInt(res.message,10)+1
           num=num.toString()
           while(num.length<n){
             num="0"+num
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
index 5e75929e..e4828404 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DepartModal.vue
@@ -41,7 +41,7 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="缩写">
-          <a-input placeholder="请输入手机号" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
+          <a-input placeholder="请输入缩写" v-decorator="['departNameAbbr', validatorRules.departNameAbbr  ]"/>
         </a-form-item>
 
         <template v-if="orgCategoryDisabled">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
index da05bb5e..0410502a 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/zyorders/service/impl/ZyOrdersServiceImpl.java
@@ -188,20 +188,30 @@ public class ZyOrdersServiceImpl extends ServiceImpl<ZyOrdersMapper, ZyOrders> i
         zyOrders.setOrdersType(zyOrdersJk.getOrdersType());
         zyOrders.setUserId(zyOrdersJk.getUserId());
         zyOrders.setGoodsQuantity(zyOrdersJk.getGoodsQuantity());
-        CustomerReceivingAddress customerReceivingAddress = customerReceivingAddressMapper.selectById(zyOrdersJk.getAddressId());
-        zyOrders.setCityId(customerReceivingAddress.getCityId());
-        zyOrders.setAddress(customerReceivingAddress.getAddress());
-        zyOrders.setZipCode(customerReceivingAddress.getZipCode());
-        zyOrders.setReceiver(zyOrdersJk.getReceiver());
-        zyOrders.setMobile(customerReceivingAddress.getMobile());
-        CustomerInvoice customerInvoice = customerInvoiceMapper.selectById(zyOrdersJk.getInvoiceId());
-        zyOrders.setInvoiceCustomerType(Integer.parseInt(customerInvoice.getCustomerType()));
-        zyOrders.setInvoiceType(Integer.parseInt(customerInvoice.getInvoiceType()));
-        zyOrders.setTaxIdentificationNumber(customerInvoice.getTaxIdentificationNumber());
-        zyOrders.setAddressBilling(customerInvoice.getAddress());
-        zyOrders.setTelephone(customerInvoice.getTelephone());
-        zyOrders.setBankPublic(customerInvoice.getBankDeposit());
-        zyOrders.setAccountNumber(customerInvoice.getAccountNumber());
+        //顾客地址
+        if(zyOrdersJk.getAddressId()!=null&&zyOrdersJk.getAddressId()!="")
+        {
+            CustomerReceivingAddress customerReceivingAddress = customerReceivingAddressMapper.selectById(zyOrdersJk.getAddressId());
+            zyOrders.setCityId(customerReceivingAddress.getCityId());
+            zyOrders.setAddress(customerReceivingAddress.getAddress());
+            zyOrders.setZipCode(customerReceivingAddress.getZipCode());
+            zyOrders.setReceiver(zyOrdersJk.getReceiver());
+            zyOrders.setMobile(customerReceivingAddress.getMobile());
+        }
+
+        //顾客发票
+        if(zyOrdersJk.getInvoiceId()!=null&&zyOrdersJk.getInvoiceId()!="")
+        {
+            CustomerInvoice customerInvoice = customerInvoiceMapper.selectById(zyOrdersJk.getInvoiceId());
+            zyOrders.setInvoiceCustomerType(Integer.parseInt(customerInvoice.getCustomerType()));
+            zyOrders.setInvoiceType(Integer.parseInt(customerInvoice.getInvoiceType()));
+            zyOrders.setTaxIdentificationNumber(customerInvoice.getTaxIdentificationNumber());
+            zyOrders.setAddressBilling(customerInvoice.getAddress());
+            zyOrders.setTelephone(customerInvoice.getTelephone());
+            zyOrders.setBankPublic(customerInvoice.getBankDeposit());
+            zyOrders.setAccountNumber(customerInvoice.getAccountNumber());
+        }
+
         zyOrders.setSalesEnterpriseId(zyOrdersJk.getSalesEnterpriseId());
         zyOrders.setSalespersonId(zyOrdersJk.getSalespersonId());
         zyOrders.setLogisticsEnterprisesId(zyOrdersJk.getLogisticsEnterprisesId());
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
index 9739143d..94a16229 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyPlanProcessServiceImpl.java
@@ -372,11 +372,20 @@ public class ZyPlanProcessServiceImpl extends ServiceImpl<ZyPlanProcessMapper, Z
             for (int i = 0; i < planProcessList.size(); i++) {
                 //第一个没有前导工序
                 if (i == 0) {
-                    ZyPlanProcess process1 = planProcessList.get(i);
-                    ZyPlanProcess process2 = planProcessList.get(i + 1);
-                    process1.setPostProcess(process2.getProcessId());
-                    process1.setPostProcessName(process2.getProcessName());
-                    updateList.add(process1);
+                    //判断是否有下到工序
+                    if(planProcessList.size()>1)
+                    {
+                        ZyPlanProcess process1 = planProcessList.get(i);
+                        ZyPlanProcess process2 = planProcessList.get(i + 1);
+                        process1.setPostProcess(process2.getProcessId());
+                        process1.setPostProcessName(process2.getProcessName());
+                        updateList.add(process1);
+                    }else
+                    {
+                        ZyPlanProcess process1 = planProcessList.get(i);
+                        updateList.add(process1);
+                    }
+
                 } else if (i > 0 && i < planProcessList.size() - 1) {
                     ZyPlanProcess process = planProcessList.get(i - 1);
                     ZyPlanProcess process1 = planProcessList.get(i);
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
index b9855198..ff0b26cf 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/productplan/service/impl/ZyProductPlanServiceImpl.java
@@ -137,7 +137,7 @@ public class ZyProductPlanServiceImpl extends ServiceImpl<ZyProductPlanMapper, Z
             SysDepart sysDepart = iSysDepartService.getById(zyProduct.getEnterprisesId());
             zyProductPlan.setProductOrg(StringUtils.isNotBlank(sysDepart.getDepartName()) ? sysDepart.getDepartName() : "");
         }
-        SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getRealname, zyProductPlan.getTeamLeader()));
+        SysUser sysUser = iSysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, zyProductPlan.getTeamLeader()));
         zyProductPlan.setTeamLeader(sysUser.getUsername());
         zyProductPlan.setStatus(new Integer(ProductPlanStatusEnum.UNAUDITED.getCode()));
         this.save(zyProductPlan);