Merge branch 'master' of http://106.14.142.95:3000/wangyuanbo/bt into master

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

imcs-bt-be/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productConfig/ProductConfigController.java

@@ -96,7 +96,9 @@ public class ProductConfigController extends SuperController<ProductConfigServic
     public R<ProductConfig> getPfg(@RequestBody ProductConfig productConfig) {
         QueryWrap<ProductConfig> productConfigQueryWrap = new QueryWrap<>();
         productConfigQueryWrap.eq("pc_spe_id", productConfig.getPcSpeId());
-        ProductConfig one = baseService.getOne(productConfigQueryWrap);
+        List<ProductConfig> list = baseService.list(productConfigQueryWrap);
+
+        ProductConfig one = list.get(0);
         if (null != one) {
             QueryWrap<Formula> formulaQueryWrap = new QueryWrap<>();
             formulaQueryWrap.eq("formula_pc_id", one.getId());
@@ -117,9 +119,9 @@ public class ProductConfigController extends SuperController<ProductConfigServic
     )
     public R<Object> updateConfig(@RequestBody @Validated ProductConfig productConfig) {
         log.info("进入updateConfig");
-        boolean b = baseService.updateById(productConfig);
+//        boolean b = baseService.updateById(productConfig);
 //        生产工艺更新成功
-        if (b) {
+        if (1==1) {
 //                更新工艺配方
             List<Formula> formulaList = productConfig.getFormula();
             if (formulaList != null) {

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/formula/entity/Formula.java

@@ -111,15 +111,15 @@ public class Formula extends Entity<Long> {
     private String formulaIsHot;
 
 
-    @ApiModelProperty(value = "是否加热")
+    @ApiModelProperty(value = "时间")
     @TableField("formula_time")
-    @Excel(name = "是否加热")
+    @Excel(name = "时间")
     private int formulaTime;
 
 
-    @ApiModelProperty(value = "是否动作")
+    @ApiModelProperty(value = "是否有操作动作")
     @TableField("formula_act")
-    @Excel(name = "是否动作")
+    @Excel(name = "是否有操作动作")
     private String  formulaAct;
 
 

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/Index.vue

@@ -161,9 +161,9 @@
         :label="$t('table.operation')" column-key="operation" align="center" class-name="small-padding fixed-width"
         width="150px">
         <template slot-scope="{ row }">
-<!--          <i @click="specManage(row)" class="el-icon-s-tools table-operation" size="max"-->
-<!--             :title="$t('bt.operation.specManage')"-->
-<!--             style="color: #2db7f5;" v-hasPermission="['parameter:add']"/>-->
+          <i @click="specManage(row)" class="el-icon-s-tools table-operation" size="max"
+             :title="$t('bt.operation.specManage')"
+             style="color: #2db7f5;" v-hasPermission="['parameter:add']"/>
 
           <i @click="flowOfProduction(row)" class="el-icon-s-tools table-operation" size="max"
              :title="$t('bt.operation.flowOfProduction')"

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/formula.vue

@@ -282,7 +282,7 @@
                 placeholder="请选择是否有操作动作"
                 @change="(val)=>{ fillMaterial(val,scope.$index)}"
               >
-                <el-option label="无" value=""></el-option>
+                <el-option label="无" value="0"></el-option>
                 <el-option label="注热水" value="1"></el-option>
                 <el-option label="蒸汽加热" value="2"></el-option>
                 <el-option label="搅拌" value="3"></el-option>
@@ -301,8 +301,8 @@
             </div>
           </template>
           <template slot-scope="scope">
-            <el-form-item :prop="'formula.'+scope.$index+'.formulaTime'" :rules="rules.formulaTime">
-              <el-input-number v-model="scope.row.formulaTime"></el-input-number>
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaTime'" :rules="rules.formulaTime" >
+              <el-input-number v-model="scope.row.formulaTime" :min=0 ></el-input-number>
             </el-form-item>
           </template>
         </el-table-column>
@@ -315,8 +315,8 @@
             </div>
           </template>
           <template slot-scope="scope">
-            <el-form-item :prop="'formula.'+scope.$index+'.formulaWeight'">
-              <el-input v-model="scope.row.formulaWeight" type="number"></el-input>
+            <el-form-item :prop="'formula.'+scope.$index+'.formulaWeight' " :rules="rules.formulaWeight">
+              <el-input v-model="scope.row.formulaWeight" type="number" :min=0 ></el-input>
             </el-form-item>
 
           </template>
@@ -393,12 +393,19 @@ export default {
             trigger: "blur"
           },
 
-        pcTime: {
+        formulaTime: {
           required: true,
           message: this.$t("rules.require"),
           trigger: "blur"
         },
 
+        formulaAct: {
+          required: true,
+          message: this.$t("rules.require"),
+          trigger: "blur"
+        },
+
+
         formulaMtId: {
           required: true,
           message: this.$t("rules.require"),
@@ -574,13 +581,13 @@ export default {
       console.log("setProCfg传参val=" + JSON.stringify(val))
 
 
-      if (val['isProCfg'] == '1') {
+      //if (val['isProCfg'] == '1') {
         console.log("getPfg(specId)即将传参" + val['id'])
         this.getPfg(val['id']);
 
-      }
+     // }
       console.log("else ,未配置")
-      this.productConfig.pcSpeId = val['id'];
+      // this.productConfig.pcSpeId = val['id'];
       this.productConfig.pcSepcName = val['specName'];
 
     },