质量巡检添添加优化

YYC

2023-07-24 65af56af565a47e191aa76ede4a62ab3fd91e789

 igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml

@@ -8,8 +8,8 @@
   autoByDepot(arg.newValue);
}
if(arg.property =="foodVariety"){
    checkByFood(arg.newValue);
}</ClientEvent>
   checkByFood(arg.newValue);&#xD;
}       </ClientEvent>
      <Property name="creationType">com.ld.igds.models.MQuality</Property>
      <PropertyDef name="id">
        <Property name="label">ID</Property>
@@ -21,13 +21,13 @@
        <Property name="label">库区编码</Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="label">检测仓库</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="foodVariety">
        <Property name="mapping">
@@ -91,20 +91,27 @@
      <PropertyDef name="checkUser">
        <Property name="label">扦样人</Property>
      </PropertyDef>
      <PropertyDef name="checkNum">
      <PropertyDef name="ypsl">
        <Property name="label">样品数量</Property>
        <Property name="displayFormat">0.0%</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">0.## KG</Property>
      </PropertyDef>
      <PropertyDef name="checkTime">
        <Property name="label">扦样时间</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="checkRepresent">
        <Property name="label">样品代表</Property>
      <PropertyDef name="dbsl">
        <Property name="label">样品代表数量</Property>
        <Property name="dataType">Double</Property>
        <Property name="displayFormat">0.## KG</Property>
      </PropertyDef>
      <PropertyDef name="checkLevel">
      <PropertyDef name="ypdj">
        <Property name="label">样品等级</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="normalYear">
        <Property name="label">正常存储年限</Property>
@@ -129,7 +136,7 @@
        <Property name="label">备注信息</Property>
      </PropertyDef>
      <Reference name="checkItems">
        <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
        <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
        <Property name="dataType">[dtCheckItems]</Property>
        <Property name="parameter">
          <Entity>
@@ -203,6 +210,62 @@
      <PropertyDef name="remarks">
        <Property name="label">化验结果</Property>
      </PropertyDef>
      <PropertyDef name="operaSymbolValue">
        <Property/>
      </PropertyDef>
      <PropertyDef name="operaSymbol">
        <Property/>
        <Property name="label">运算符号</Property>
      </PropertyDef>
      <PropertyDef name="ruleNum">
        <Property name="dataType">Double</Property>
        <Property name="label">扣重系数</Property>
      </PropertyDef>
      <PropertyDef name="ruleAdd">
        <Property name="dataType">Double</Property>
        <Property name="label">增重%</Property>
      </PropertyDef>
      <PropertyDef name="ruleAddEnd">
        <Property name="dataType">Double</Property>
        <Property name="label">增重上限%</Property>
      </PropertyDef>
      <PropertyDef name="ruleReduce">
        <Property name="dataType">Double</Property>
        <Property name="label">扣重值%</Property>
      </PropertyDef>
      <PropertyDef name="rulePrice">
        <Property name="dataType">Double</Property>
        <Property name="label">扣费系数</Property>
      </PropertyDef>
      <PropertyDef name="ruleReducePrice">
        <Property name="dataType">Double</Property>
        <Property name="label">扣费</Property>
      </PropertyDef>
      <PropertyDef name="addNum">
        <Property name="dataType">Double</Property>
        <Property name="label">增重</Property>
      </PropertyDef>
      <PropertyDef name="deNum">
        <Property name="dataType">Double</Property>
        <Property name="label">扣重</Property>
      </PropertyDef>
      <PropertyDef name="addPrice">
        <Property name="dataType">Double</Property>
        <Property name="label">增价</Property>
      </PropertyDef>
      <PropertyDef name="dePrice">
        <Property name="dataType">Double</Property>
        <Property name="label">扣价</Property>
      </PropertyDef>
      <PropertyDef name="result">
        <Property/>
        <Property name="label">检验结果</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerResult&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
    </DataType>
    <DataType name="dataTypeUser">
      <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
@@ -215,8 +278,9 @@
        </Validator>
        <Validator type="custom">
          <ClientEvent name="onValidate">if (arg.entity.get(&quot;confirmPassword&quot;)){
   arg.entity.validate(&quot;confirmPassword&quot;);
}</ClientEvent>
                        arg.entity.validate(&quot;confirmPassword&quot;);
                        }
                    </ClientEvent>
        </Validator>
      </PropertyDef>
      <PropertyDef name="confirmPassword">
@@ -225,12 +289,13 @@
        <Property name="required">true</Property>
        <Validator type="custom">
          <ClientEvent name="onValidate">var confirm = arg.data;&#xD;
var password = arg.entity.get(&quot;password&quot;);&#xD;
if (confirm ==password) {&#xD;
   arg.result = { state:&quot;ok&quot;}&#xD;
} else {&#xD;
   arg.result = { state:&quot;error&quot;, text: &quot;两次密码不一致&quot;};   &#xD;
}</ClientEvent>
                        var password = arg.entity.get(&quot;password&quot;);&#xD;
                        if (confirm ==password) {&#xD;
                        arg.result = { state:&quot;ok&quot;}&#xD;
                        } else {&#xD;
                        arg.result = { state:&quot;error&quot;, text: &quot;两次密码不一致&quot;}; &#xD;
                        }
                    </ClientEvent>
        </Validator>
      </PropertyDef>
      <PropertyDef name="salt">
@@ -319,7 +384,8 @@
        <Property name="required">true</Property>
        <Validator type="regExp">
          <Property name="resultMessage">邮箱格式输入错误</Property>
          <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$</Property>
          <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
                    </Property>
          <Property name="validateMode">whiteBlack</Property>
        </Validator>
        <Validator type="length">
@@ -336,26 +402,25 @@
&#xD;
//根据仓库自动回填粮食品种，登记，产地新&#xD;
autoByDepot = function(depotId){&#xD;
   view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
      if(result){&#xD;
         var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
         data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
         data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
         data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
         data.set(&quot;foodType&quot;,result.foodType);&#xD;
      }&#xD;
   });&#xD;
   view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
     if(result){&#xD;
     var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
     data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
     data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
     data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
     data.set(&quot;foodType&quot;,result.foodType);&#xD;
   }&#xD;
});&#xD;
};&#xD;
&#xD;
//根据粮食品种查询化验项并回显&#xD;
checkByFood = function(foodVariety){&#xD;
   view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
       if(result){&#xD;
           var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
           data.set(&quot;checkItems&quot;,result);&#xD;
        }&#xD;
   }); &#xD;
};</ClientEvent>
view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
if(result){&#xD;
 var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
 data.set(&quot;checkItems&quot;,result);&#xD;
   }&#xD;
  }); &#xD;
};      </ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="loadMode">lazy</Property>
@@ -381,40 +446,42 @@
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
view.get(&quot;#dialogMain&quot;).show();              </ClientEvent>
        <Property name="caption">新增</Property>
        <Property name="exClassName">btn-default</Property>
        <Property name="iconClass">fa fa-plus</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
                    if(data){&#xD;
                    view.get(&quot;#dialogMain&quot;).show();&#xD;
                    }
                </ClientEvent>
        <Property name="caption">修改</Property>
        <Property name="exClassName">btn-warm</Property>
        <Property name="iconClass">fa fa-pencil</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(!data){&#xD;
   return;&#xD;
}&#xD;
view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
   if(result){&#xD;
      $alert(result);&#xD;
      return;&#xD;
   }else{&#xD;
      data.remove();&#xD;
   }&#xD;
});</ClientEvent>
                    if(!data){&#xD;
                    return;&#xD;
                    }&#xD;
                    view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
                    if(result){&#xD;
                    $alert(result);&#xD;
                    return;&#xD;
                    }else{&#xD;
                    data.remove();&#xD;
                    }&#xD;
                    });
                </ClientEvent>
        <Property name="caption">删除</Property>
        <Property name="exClassName">btn-warn</Property>
        <Property name="iconClass">fa fa-minus</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
</ClientEvent>
                </ClientEvent>
        <Property name="caption">刷新</Property>
        <Property name="exClassName">btn-default</Property>
        <Property name="iconClass">fa fa-refresh</Property>
@@ -451,7 +518,8 @@
        <Container layout="hbox regionPadding:15">
          <Button layoutConstraint="left">
            <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();</ClientEvent>
                            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();
                        </ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="exClassName">btn-default</Property>
            <Property name="iconClass">fa fa-refresh</Property>
@@ -467,8 +535,8 @@
      <DataGrid layoutConstraint="center padding:5px">
        <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}              </ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
@@ -540,20 +608,22 @@
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data.validate() != 'ok'){&#xD;
   $notify(&quot;数据校验失败！！&quot;);&#xD;
   return;&#xD;
}&#xD;
view.get(&quot;#uaAction&quot;).set(&quot;parameter&quot;,data).execute(function(){&#xD;
   self.get(&quot;parent&quot;).hide();&#xD;
});</ClientEvent>
                        if(data.validate() != 'ok'){&#xD;
                        $notify(&quot;数据校验失败！！&quot;);&#xD;
                        return;&#xD;
                        }&#xD;
                        view.get(&quot;#uaAction&quot;).set(&quot;parameter&quot;,data).execute(function(){&#xD;
                        self.get(&quot;parent&quot;).hide();&#xD;
                        });
                    </ClientEvent>
          <Property name="caption">保存</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">btn-normal</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
self.get(&quot;parent&quot;).hide();</ClientEvent>
                        self.get(&quot;parent&quot;).hide();
                    </ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
          <Property name="exClassName">btn-warn</Property>
@@ -567,7 +637,7 @@
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="readOnly">false</Property>
              <Property name="labelSeparator"> : </Property>
              <Property name="labelSeparator">:</Property>
              <Property name="labelAlign">right</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="labelWidth">120</Property>
@@ -614,8 +684,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">checkNum</Property>
                <Property name="property">checkNum</Property>
                <Property name="name">ypsl</Property>
                <Property name="property">ypsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -640,13 +710,13 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">checkRepresent</Property>
                <Property name="property">checkRepresent</Property>
                <Property name="name">dbsl</Property>
                <Property name="property">dbsl</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">checkLevel</Property>
                <Property name="property">checkLevel</Property>
                <Property name="name">ypdj</Property>
                <Property name="property">ypdj</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -686,51 +756,90 @@
          <Buttons/>
          <Children>
            <DataGrid id="dataGridCheckItem">
              <ClientEvent name="onCellValueEdit">var data = arg.entity&#xD;
if (data) {&#xD;
   //填写的数据值;&#xD;
   var newValue = data.get(&quot;value&quot;);&#xD;
   //标准值;&#xD;
   var limit = data.get(&quot;upperLimit&quot;);&#xD;
   //运算符;&#xD;
   var symbol = data.get(&quot;operaSymbol&quot;);&#xD;
   if (symbol &amp;&amp; limit &amp;&amp; newValue) {&#xD;
      if (&quot;>=&quot; == symbol) {&#xD;
         if (newValue &lt; limit) {&#xD;
            data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
         }&#xD;
         else {&#xD;
            data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
         }&#xD;
      }&#xD;
      if (&quot;&lt;=&quot; == symbol) {&#xD;
         if (newValue > limit) {&#xD;
            data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
         }&#xD;
         else {&#xD;
            data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
         }&#xD;
      }&#xD;
      if (&quot;==&quot; == symbol) {&#xD;
         if (newValue != limit) {&#xD;
            data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
         }&#xD;
         else {&#xD;
            data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
         }&#xD;
      }&#xD;
   }&#xD;
}</ClientEvent>
              <Property name="dataPath">#.checkItems</Property>
              <Property name="dataSet">dsMain</Property>
              <Property name="hideMode">display</Property>
              <Property name="highlightCurrentRow">false</Property>
              <Property name="visible">true</Property>
              <RowNumColumn/>
              <DataColumn>
                <Property name="name">standardName</Property>
              <DataColumn name="standardName">
                <Property name="property">standardName</Property>
                <Property name="align">center</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </DataColumn>
              <DataColumn>
                <Property name="name">value</Property>
              <DataColumn name="value">
                <Property name="property">value</Property>
                <Property name="align">center</Property>
                <Editor/>
              </DataColumn>
              <DataColumn>
                <Property name="name">upperLimit</Property>
                <Property name="property">upperLimit</Property>
                <Property name="align">center</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </DataColumn>
              <DataColumn>
                <Property name="name">lowerLimit</Property>
                <Property name="property">lowerLimit</Property>
                <Property name="align">center</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </DataColumn>
              <DataColumn>
                <Property name="name">unit</Property>
              <DataColumn name="unit">
                <Property name="property">unit</Property>
                <Property name="align">center</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </DataColumn>
              <DataColumn>
                <Property name="name">remarks</Property>
              <DataColumn name="operaSymbolValue">
                <Property name="property">operaSymbolValue</Property>
                <Property name="align">center</Property>
                <Property name="caption">标准值</Property>
                <Property name="readOnly">true</Property>
              </DataColumn>
              <DataColumn name="deNum">
                <Property name="property">deNum</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="addNum">
                <Property name="property">addNum</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="dePrice">
                <Property name="property">dePrice</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="addPrice">
                <Property name="property">addPrice</Property>
                <Property name="align">center</Property>
              </DataColumn>
              <DataColumn name="result">
                <Property name="property">result</Property>
                <Property name="align">center</Property>
                <Property name="readOnly">true</Property>
              </DataColumn>
              <DataColumn name="remarks">
                <Property name="property">remarks</Property>
                <Property name="align">center</Property>
                <Editor/>
              </DataColumn>
            </DataGrid>
          </Children>
@@ -753,7 +862,7 @@
      <Property name="service">depotPR#getDepot</Property>
    </AjaxAction>
    <AjaxAction id="ajaxGetCheck">
      <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
      <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
    </AjaxAction>
    <CustomDropDown id="ddFoodOrigin">
      <Property name="minHeight">480</Property>
@@ -761,36 +870,39 @@
      <Property name="minWidth">360</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
          <Property name="dataType">[dtFoodOrigin]</Property>
          <Property name="dataProvider">dicAreaPR#pageList</Property>
          <Property name="dataType">[dtArea]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 编码或者名称 --</Property>
            <Property name="blankText">-- 编码或者名称 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
                            view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();
                        </ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
                            if(data){&#xD;
                            view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
                            }
                        </ClientEvent>
            <Property name="iconClass">fa fa-check</Property>
            <Property name="caption">确定</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
                        if(data){&#xD;
                        view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
                        }
                    </ClientEvent>
          <Property name="dataSet">dsFoodOrigin</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="code">
@@ -800,7 +912,8 @@
          </DataColumn>
          <DataColumn name="name">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
                            arg.processDefault = true;
                        </ClientEvent>
            <Property name="property">name</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>