注释和修改细节

SC-boot/linkage-scm/src/main/java/jnpf/accounting/controller/AccountingController.java

@@ -344,7 +344,7 @@ public class AccountingController {
 
 
     /**
-     * 开启
+     * 开启账期
      *
      * @param id
      * @return
@@ -357,7 +357,7 @@ public class AccountingController {
         QueryWrapper<AccountingEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId());
         if(entity!=null){
-            entity.setStatus("1");
+            entity.setStatus("0");
             accountingService.update(id, entity);
             return ActionResult.success("更新成功");
         }else{
@@ -366,7 +366,7 @@ public class AccountingController {
     }
 
     /**
-     * 关闭
+     * 关闭账期
      *
      * @param id
      * @return
@@ -379,7 +379,7 @@ public class AccountingController {
         QueryWrapper<AccountingEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(AccountingEntity::getId,entity.getId());
         if(entity!=null){
-            entity.setStatus("0");
+            entity.setStatus("1");
             accountingService.update(id, entity);
             return ActionResult.success("更新成功");
         }else{

SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java

@@ -660,6 +660,7 @@ public class PaymentController {
                 paymentdocEntity.setIsSubmit("0");
 
             }
+            //删除修改付款申请单状态
             paymentdocService.updateBatchById(paymentdocList);
 
             paymentService.delete(entity);

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java

@@ -490,7 +490,7 @@ public class TradeuploadController {
         customerQueryWrapper.lambda().eq(CustomerEntity::getSupplierNm, tradeuploadCrForm.getCustomerId());
         CustomerEntity customerEntity = customerService.getOne(customerQueryWrapper);
         tradeuploadCrForm.setClientId(customerEntity.getId());
-
+        //查询合同
         QueryWrapper<ContractFileEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ContractFileEntity::getCode, customerEntity.getId());
         queryWrapper.lambda().eq(ContractFileEntity::getContractType, "1");
@@ -509,7 +509,7 @@ public class TradeuploadController {
             detpartment = userProvider.getDepartmentId(userId);
             vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId, detpartment);
         }
-
+        //查询车辆然后获取净重等
         VehicleEntity vehicleEntity = vehicleService.getOne(vehicleQueryWrapper);
         if (vehicleEntity != null) {
             tradeuploadCrForm.setVehiclePictures(vehicleEntity.getVehiclephotos());
@@ -978,6 +978,7 @@ public class TradeuploadController {
                 PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getId, entity.getPurchaseorderId());
                 PurchaseorderqueryWrapper.lambda().eq(PurchaseorderEntity::getDeleteMark, 0);
                 List<PurchaseorderEntity> Pur = purchaseorderService.list(PurchaseorderqueryWrapper);
+                //查询有无付款申请，有不能修改
                 if (Pur.size() > 0) {
                     int paymenttime = Integer.valueOf(Pur.get(0).getPaymentTime());
                     if (list != null && list.get(0).getPurchaseorderId() != null && paymenttime > 0) {
@@ -993,7 +994,6 @@ public class TradeuploadController {
 
                 }
             }
-
             tradeuploadService.update(id, subentity);
             return ActionResult.success("更新成功");
         } else {

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java

@@ -145,6 +145,7 @@ public class VehicleController {
             detpartment = userProvider.getDepartmentId(userId);
             vehicleQueryWrapper.lambda().eq(VehicleEntity::getDepartmentId,detpartment);
         }
+        //查询车辆和司机
         List<VehicleEntity> vehicleEntityList = vehicleService.list(vehicleQueryWrapper);
        if (vehicleEntityList.size()>0){
            return ActionResult.fail("已经存在该车辆信息");

SC-web/src/views/scm/basicInformation/contractfile/Detail.vue

@@ -347,15 +347,15 @@
         statusOptions: [
           {
             fullName: "进行中",
-            id: "0",
+            id: "1",
           },
           {
             fullName: "审批中",
-            id: "1",
+            id: "2",
           },
           {
             fullName: "审批结束",
-            id: "2",
+            id: "3",
           },
         ],
         classificationOptions: [

SC-web/src/views/scm/basicInformation/contractfile/index.vue

@@ -445,15 +445,15 @@ export default {
       statusOptions: [
         {
           fullName: "进行中",
-          id: "0",
+          id: "1",
         },
         {
           fullName: "审批中",
-          id: "1",
+          id: "2",
         },
         {
           fullName: "审批结束",
-          id: "2",
+          id: "3",
         },
       ],
 

SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue

@@ -108,7 +108,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="磅单时间" prop="poundDate">
-              <el-date-picker disabled v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
+              <el-date-picker  v-model="dataForm.poundDate" placeholder="请选择" clearable :style='{"width":"100%"}'
                               type="date" format="yyyy-MM-dd" value-format="timestamp">
               </el-date-picker>
             </el-form-item>