添加扦样信息

YYC

2023-07-13 43a14ad6fbb68a9c0ce787acce28ce446aac13b0

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml

@@ -56,9 +56,9 @@
      </PropertyDef>
      <PropertyDef name="recordStatus">
        <Property></Property>
        <Property name="label">数据状态</Property>
        <Property name="label">单据状态</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;RECORD_STATUS&quot;)}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerRecordStatus1&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
@@ -183,11 +183,11 @@
        <Property name="label">扣价</Property>
      </PropertyDef>
      <PropertyDef name="result">
        <Property/>
        <Property></Property>
        <Property name="label">检验结果</Property>
      </PropertyDef>
      <PropertyDef name="operaSymbolValue">
        <Property/>
        <Property></Property>
      </PropertyDef>
    </DataType>
  </Model>
@@ -206,6 +206,7 @@
//默认查询查询提条件&#xD;
view.get(&quot;#dsQuery&quot;).insert({&#xD;
   type:TYPE,&#xD;
   recordStatus:'NORMAL',&#xD;
   deptId:deptId&#xD;
});&#xD;
&#xD;
@@ -221,7 +222,6 @@
edit = function(){&#xD;
   var data = view.get(&quot;#dataGridMain.currentEntity&quot;);&#xD;
   if(!data) return;&#xD;
   &#xD;
   if (&quot;RECORD&quot; == data.get(&quot;progress&quot;)) {&#xD;
      view.get(&quot;#btnOK&quot;).set(&quot;visible&quot;,true);&#xD;
   }else{&#xD;
@@ -333,110 +333,6 @@
   });&#xD;
};&#xD;
</ClientEvent>
    <ClientEvent name="onCreate">&#xD;
/**&#xD;
 * 自动计算，当前页面不自动关联扦样记录，全部由手动为准&#xD;
 * &#xD;
 * 1.净重 = 毛重 - 皮重&#xD;
 * 2.总扣重 = 现场扣重 + 其他扣重 + 扣水杂质&#xD;
 * 3.结算重量 = 净重 - 总扣重 （含水杂增重）&#xD;
 * 4.出/入库重量 = 净重 - 总扣重 （不含水杂增重）&#xD;
 * &#xD;
 * 5.入库时：扣水杂 正数 = 扣重，负数 = 增重&#xD;
 * 6.出库时：水分增重，正数=增重，负数=扣重&#xD;
 */&#xD;
deAutoByWeight = function(name){&#xD;
   &#xD;
   if(null == name) name = &quot;1&quot;;&#xD;
   &#xD;
   var curData = view.get(&quot;#dsMain.data:#&quot;);&#xD;
   var fullWeight = curData.get(&quot;fullWeight&quot;);&#xD;
   var emptyWeight = curData.get(&quot;emptyWeight&quot;);&#xD;
   &#xD;
   if(fullWeight == 0 || emptyWeight == 0){&#xD;
      return;&#xD;
   }&#xD;
   // 净重&#xD;
   var netWeight = Number(fullWeight) - Number(emptyWeight);&#xD;
   &#xD;
   if (netWeight &lt;= 0){&#xD;
      $notify(&quot;净重小于0，当前称重存在逻辑问题&quot;);&#xD;
      return;&#xD;
   }&#xD;
   &#xD;
    //汇总结果&#xD;
    var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;&#xD;
    //扣水杂&#xD;
    var deWet = 0;&#xD;
   &#xD;
   var impurity = 0;&#xD;
   &#xD;
   &#xD;
    var deBase = 0, multiple = 0;&#xD;
    var checkItems = curData.get(&quot;checkItems&quot;);&#xD;
&#xD;
    /** 总扣重，不含增重*/&#xD;
    deSum = Number(curData.get(&quot;deOther&quot;)) + Number(curData.get(&quot;deHandle&quot;));&#xD;
   &#xD;
   //出库&#xD;
   if (&quot;OUT&quot; == curData.get(&quot;type&quot;)) {&#xD;
      if (Number(deWet) > 0) {//增重&#xD;
           addSum = addSum + Number(deWet);&#xD;
       } else {&#xD;
           deSum = deSum + Number(deWet);&#xD;
       }&#xD;
&#xD;
       if (Number(deImpurity) > 0) {//扣重&#xD;
           deSum = deSum + Number(deImpurity);&#xD;
          } else {&#xD;
           addSum = addSum + Number(deImpurity);&#xD;
       }&#xD;
   }else{&#xD;
      if (Number(deWet) > 0) {//扣重&#xD;
           deSum = deSum + Number(deWet);&#xD;
       } else {&#xD;
           addSum = addSum + Number(deWet);&#xD;
       }&#xD;
       if (Number(deImpurity) > 0) {//扣重&#xD;
           deSum = deSum + Number(deImpurity);&#xD;
       } else {&#xD;
           addSum = addSum + Number(deImpurity);&#xD;
       }&#xD;
   }&#xD;
   &#xD;
    deSum = deSum.toFixed(0);&#xD;
    /** 增重转正数，便于计算  */&#xD;
    addSum = Math.abs(addSum).toFixed(0);&#xD;
   &#xD;
    /** 入库重量 = 净重 - 总扣重  */&#xD;
    recordWeight = Number(netWeight) - Number(deSum);&#xD;
   &#xD;
    /** 结算重量 = 净重 - 总扣重 + 增重 */&#xD;
    settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);&#xD;
   &#xD;
   curData.set(&quot;netWeight&quot;,netWeight);&#xD;
   curData.set(&quot;settleWeight&quot;,settleWeight);&#xD;
   curData.set(&quot;recordWeight&quot;,recordWeight);&#xD;
};&#xD;
&#xD;
/**&#xD;
 * 根据化验项和传递过来的参数获取当前参数的配置信息&#xD;
 * @param checkItems&#xD;
 * @param code1 系统参数ID&#xD;
 * @param code2 国标参数ID&#xD;
 * @returns {undefined}&#xD;
 */&#xD;
function getCheckItem(checkItems, code1, code2) {&#xD;
    if (!checkItems) return null;&#xD;
    $.each(checkItems, function (index, checkItem) {&#xD;
        if (checkItem.get(&quot;standardId&quot;) == code1 || checkItem.get(&quot;standardId&quot;) == code2) {&#xD;
            if (checkItem.get(&quot;ruleNum&quot;) &amp;&amp; checkItem.get(&quot;upperLimit&quot;) > 0.0) {&#xD;
                return checkItem;&#xD;
            }&#xD;
        }&#xD;
    });&#xD;
    return null;&#xD;
}</ClientEvent>
    <Property name="packages">font-awesome,css-common</Property>
    <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
    <DataSet id="dsMain">
@@ -522,15 +418,6 @@
        </Editor>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">userId</Property>
        <Property name="property">userId</Property>
        <Editor>
          <TextEditor>
            <Property name="blankText">-- 支持模糊 --</Property>
          </TextEditor>
        </Editor>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
@@ -546,6 +433,11 @@
        <Property name="name">orderTag</Property>
        <Property name="property">orderTag</Property>
        <Property name="trigger">autoMappingDropDown1</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">recordStatus</Property>
        <Property name="property">recordStatus</Property>
        <Editor/>
      </AutoFormElement>
      <Container layout="hbox regionPadding:15">
@@ -712,7 +604,7 @@
        </Button>
        <Button id="btnFlushCheck" layoutConstraint="left">
          <ClientEvent name="onClick">flushCheckList();</ClientEvent>
          <Property name="caption">获取质检项</Property>
          <Property name="caption">重新获取质检项</Property>
          <Property name="exClassName">btn-default</Property>
          <Property name="iconClass">fa fa-gavel</Property>
          <Property name="visible">false</Property>
@@ -823,7 +715,7 @@
                    <AutoFormElement>
                      <Property name="name">foodLocation</Property>
                      <Property name="property">foodLocation</Property>
                      <Property name="trigger">ddFoodOrigin</Property>
                      <Property name="trigger">ddDicArea</Property>
                      <Editor/>
                    </AutoFormElement>
                  </AutoForm>
@@ -864,7 +756,7 @@
var id = self.getDom().id;&#xD;
var prop = id.substring(2,id.length);&#xD;
deAutoByWeight(prop);&#xD;
                                            </ClientEvent>
</ClientEvent>
                      <Property name="name">fullWeight</Property>
                      <Property name="property">fullWeight</Property>
                      <Editor/>
@@ -905,11 +797,19 @@
                      <Editor/>
                    </AutoFormElement>
                    <AutoFormElement layoutConstraint="colSpan:2">
                      <ClientEvent name="onBlur">//id 规则 d_prop&#xD;
var id = self.getDom().id;&#xD;
var prop = id.substring(2,id.length);&#xD;
deAutoByWeight(prop);</ClientEvent>
                      <Property name="name">deCheck</Property>
                      <Property name="property">deCheck</Property>
                      <Editor/>
                    </AutoFormElement>
                    <AutoFormElement layoutConstraint="colSpan:2">
                      <ClientEvent name="onBlur">//id 规则 d_prop&#xD;
var id = self.getDom().id;&#xD;
var prop = id.substring(2,id.length);&#xD;
deAutoByWeight(prop);</ClientEvent>
                      <Property name="name">addCheck</Property>
                      <Property name="property">addCheck</Property>
                      <Editor/>
@@ -1078,6 +978,22 @@
                  <Property name="label">质检时间</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">sampleUser</Property>
                  <Property name="property">sampleUser</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">sampleTime</Property>
                  <Property name="property">sampleTime</Property>
                  <Editor/>
                </AutoFormElement>
                <AutoFormElement>
                  <Property name="name">sampleType</Property>
                  <Property name="property">sampleType</Property>
                  <Property name="editorType">RadioGroup</Property>
                  <Editor/>
                </AutoFormElement>
              </AutoForm>
              <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
                <Property name="dataSet">dsMain</Property>
@@ -1101,14 +1017,38 @@
                  <Property name="property">unit</Property>
                  <Property name="width">80</Property>
                  <Property name="readOnly">true</Property>
                </DataColumn>
                <DataColumn name="standardValue">
                  <Property name="property">standardValue</Property>
                  <Property name="readOnly">true</Property>
                  <Property name="align">center</Property>
                </DataColumn>
                <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>
                </DataColumn>
              </DataGrid>
            </Container>
@@ -1222,53 +1162,53 @@
      <Property name="titleName">单据列表</Property>
      <Property name="dataScope">currentPage</Property>
    </Export2ReportAction>
    <CustomDropDown id="ddFoodOrigin">
    <CustomDropDown id="ddDicArea">
      <Property name="minHeight">500</Property>
      <Property name="assignmentMap">foodLocation=name</Property>
      <Property name="minWidth">500</Property>
      <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider"></Property>
          <Property name="dataType">[dtFoodOrigin]</Property>
        <DataSet id="dsDicArea">
          <Property name="dataProvider">dicAreaPR#pageList</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>
          <Property name="dataType">[dtArea]</Property>
          <Property name="pageSize">1000</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 编码或者名称 --</Property>
            <Property name="blankText"> -名称或简拼，北京市  bjs -</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;#dsDicArea&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;
            <ClientEvent name="onClick">var data = view.get(&quot;#dsDicArea.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
   view.get(&quot;#ddDicArea&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;
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsDicArea.data:#&quot;);&#xD;
if(data){&#xD;
   view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
   view.get(&quot;#ddDicArea&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
          <Property name="dataSet">dsFoodOrigin</Property>
          <Property name="dataSet">dsDicArea</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="code">
            <Property name="property">code</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="name">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
            <Property name="property">name</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="code">
            <Property name="property">code</Property>
            <Property name="readOnly">true</Property>
            <Property name="align">center</Property>
          </DataColumn>
@@ -1279,13 +1219,13 @@
          </DataColumn>
        </DataGrid>
        <DataPilot layoutConstraint="bottom">
          <Property name="dataSet">dsFoodOrigin</Property>
          <Property name="dataSet">dsDicArea</Property>
        </DataPilot>
      </Container>
    </CustomDropDown>
    <CustomDropDown id="ddNotice">
      <Property name="minHeight">400</Property>
      <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
      <Property name="minWidth">500</Property>
      <Property name="autoOpen">true</Property>
      <Container layout="regionPadding:5">