录入价格功能放到订单变更里面

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java

@@ -84,8 +84,11 @@ public class OrderYsServiceImpl implements OrderYsService {
 
     @Override
     public void createOrUpdate(ProjectOrderSaveReqVO operateReqVO) {
-        if (operateReqVO.getHasPrice().equals(1)){
+        LambdaQueryWrapper<OrderYsDO> eq = new LambdaQueryWrapper<OrderYsDO>().eq(OrderYsDO::getCode, operateReqVO.getCode());
-            OrderYsDO orderYsDO = new OrderYsDO();
+        OrderYsDO orderYsDO = orderYsMapper.selectOne(eq);
+        if (ObjectUtil.isEmpty(orderYsDO)){
+            if (operateReqVO.getHasPrice().equals(1)) {
+                orderYsDO = new OrderYsDO();
                 orderYsDO.setCode(operateReqVO.getCode());
                 orderYsDO.setProjectName(operateReqVO.getProjectName());
                 orderYsDO.setCgTime(LocalDateTime.now());
@@ -109,8 +112,25 @@ public class OrderYsServiceImpl implements OrderYsService {
                         }
                     }
                 }
-
+            }
             orderYsMapper.insert(orderYsDO);
+        }else {
+            orderYsDO.setCgYs(operateReqVO.getPrice());
+            LocalDateTime[] paymentTimes = {
+                    operateReqVO.getSixFuKuanTime(),
+                    operateReqVO.getFiveFuKuanTime(),
+                    operateReqVO.getFourFuKuanTime(),
+                    operateReqVO.getThreeFuKuanTime(),
+                    operateReqVO.getTwoFuKuanTime(),
+                    operateReqVO.getShouFuKuanTime()
+            };
+            for (LocalDateTime paymentTime : paymentTimes) {
+                if (!ObjectUtil.isEmpty(paymentTime)) {
+                    orderYsDO.setPaymentDate(paymentTime);
+                    break;
+                }
+            }
+            orderYsMapper.updateById(orderYsDO);
         }
     }
 

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/projectorder/ProjectOrderServiceImpl.java

@@ -195,10 +195,15 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
         LambdaQueryWrapper<OrderYsDO> eq = new LambdaQueryWrapper<OrderYsDO>().eq(OrderYsDO::getCode, updateReqVO.getCode());
         OrderYsDO orderYsDO = orderYsMapper.selectOne(eq);
         if (ObjectUtil.isEmpty(orderYsDO)){
+            if (updateReqVO.getHasPrice().equals(1)) {
                 orderYsDO = new OrderYsDO();
                 orderYsDO.setCode(updateReqVO.getCode());
                 orderYsDO.setProjectName(updateReqVO.getProjectName());
                 orderYsDO.setCgTime(LocalDateTime.now());
+                orderYsDO.setCgKhname(customerService.getCustomer(updateReqVO.getCustomerId()).getName());
+                if(updateReqVO.getPrice()==null){
+                    orderYsDO.setCgYs(new BigDecimal(0));
+                }else {
                     orderYsDO.setCgYs(updateReqVO.getPrice());
                     LocalDateTime[] paymentTimes = {
                             updateReqVO.getSixFuKuanTime(),
@@ -214,6 +219,8 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
                             break;
                         }
                     }
+                }
+            }
             orderYsMapper.insert(orderYsDO);
         }else {
             orderYsDO.setCgYs(updateReqVO.getPrice());
@@ -470,7 +477,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
 //                List<StorageLogNowDO> pageResult = storageLogService.getStorageNowPagesmall(pageReqVO);//查询符合条件的值
                 for (AttentiontodoDO attentiontodoRespVO : attentiontodook) {
                     {
-                        //  for (StorageLogNowDO storageLogNowDO : pageResult) {
+                        //  for (StorageLogNowDO storgeLogNowDO : pageResult) {
                         bdgzsomthingDO BdgzsomthingDO = new bdgzsomthingDO();
                         BdgzsomthingDO.setThingname(attentiontodoRespVO.getEvent());//事件名称
                         BdgzsomthingDO.setThings(operateReqVO.getProjectName()+operateReqVO.getContractNo()+"价格没有录入系统");//事件名称
@@ -507,7 +514,7 @@ public class ProjectOrderServiceImpl implements ProjectOrderService {
 
             }
         }else{
-            if ("PRICE".equals(operateReqVO.getActive())){
+            if ("ALTER".equals(operateReqVO.getActive())){
                 updateProjectOrderPrice(operateReqVO);
             }else {
                 updateProjectOrder(operateReqVO);

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue

@@ -197,7 +197,7 @@
 										<el-form-item label="首付款预计时间" prop="shouFuKuanTime">
 											<el-date-picker class="!w-250px" v-model="formData.shouFuKuanTime"
 												type="date" value-format="x" placeholder="选择日期"
-												:disabled="alterDisabled || detailDisabled" />
+												:disabled="detailDisabled || formData.hasPrice == 0" />
 										</el-form-item>
 									</el-col>
 
@@ -207,7 +207,7 @@
 										<el-form-item label="第三笔款预计时间" prop="threeFuKuanTime">
 											<el-date-picker class="!w-250px" v-model="formData.threeFuKuanTime"
 												type="date" value-format="x" placeholder="选择日期"
-												:disabled="alterDisabled || detailDisabled" />
+												:disabled="detailDisabled || formData.hasPrice == 0" />
 										</el-form-item>
 									</el-col>
 
@@ -217,7 +217,7 @@
 										<el-form-item label="第五笔款预计时间" prop="fiveFuKuanTime">
 											<el-date-picker class="!w-250px" v-model="formData.fiveFuKuanTime"
 												type="date" value-format="x" placeholder="选择日期"
-												:disabled="alterDisabled || detailDisabled" />
+												:disabled="detailDisabled || formData.hasPrice == 0" />
 										</el-form-item>
 									</el-col>
 								</el-row>
@@ -397,7 +397,7 @@
 								<el-form-item label="第二笔预计时间" prop="twoFuKuanTime">
 									<el-date-picker class="!w-250px" v-model="formData.twoFuKuanTime" type="date"
 										value-format="x" placeholder="选择日期"
-										:disabled="alterDisabled || detailDisabled" />
+										:disabled="detailDisabled || formData.hasPrice == 0" />
 								</el-form-item>
 							</el-col>
 
@@ -407,7 +407,7 @@
 								<el-form-item label="第四笔款预计时间" prop="fourFuKuanTime">
 									<el-date-picker class="!w-250px" v-model="formData.fourFuKuanTime" type="date"
 										value-format="x" placeholder="选择日期"
-										:disabled="alterDisabled || detailDisabled" />
+										:disabled="detailDisabled || formData.hasPrice == 0" />
 								</el-form-item>
 							</el-col>
 
@@ -417,7 +417,7 @@
 								<el-form-item label="第六笔款预计时间" prop="sixFuKuanTime">
 									<el-date-picker class="!w-250px" v-model="formData.sixFuKuanTime" type="date"
 										value-format="x" placeholder="选择日期"
-										:disabled="alterDisabled || detailDisabled" />
+										:disabled="detailDisabled || formData.hasPrice == 0" />
 								</el-form-item>
 							</el-col>
 						</el-row>

mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/index.vue

@@ -141,9 +141,9 @@ ref="multipleTableRef"
                 <el-button link type="danger" @click="handleDelete(scope.row.id)" v-if="(scope.row.orderStatus == 4 && scope.row.hasAlter == 0) ||scope.row.orderStatus == 3 ">
                   删除
                 </el-button>
-                <el-button link type="primary"  @click="openDetail('price',scope.row.id)" v-if="scope.row.orderStatus!=4&&scope.row.hasPrice==1">
+<!--                <el-button link type="primary"  @click="openDetail('price',scope.row.id)" v-if="scope.row.orderStatus!=4&&scope.row.hasPrice==1">-->
-                   录入价格
+<!--                   录入价格-->
-                </el-button>
+<!--                </el-button>-->
                 <el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.orderStatus == 4 || scope.row.orderStatus == 3">
                   编辑
                 </el-button>