Merge remote-tracking branch 'origin/master'

jiazx0107

2026-02-08 e7ab049344b954b044fc474992c378fcbbeeba33

 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml

@@ -366,11 +366,6 @@
   view.get("#btnDel").set("visible",false);
}

if("OUT" == TYPE){
   view.get("#recordWeight").set("caption","出库重量");
}else{
   view.get("#recordWeight").set("caption","入库重量");
}

//默认查询查询提条件
view.get("#dsQuery").insert({
@@ -584,7 +579,7 @@
        </ToolBarButton>
        <ToolBarButton id="btnDel">
          <ClientEvent name="onClick">showAbnormal();</ClientEvent>
          <Property name="caption">异常操作</Property>
          <Property name="caption">作废操作</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-minus</Property>
          <Property name="width">100</Property>
@@ -608,6 +603,22 @@
          <Property name="caption">打印过磅单</Property>
          <Property name="exClassName">btn4</Property>
          <Property name="iconClass">fa fa-print</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
        <ToolBarButton>
          <Property name="caption">导入EXCEL</Property>
          <Property name="exClassName">btn2</Property>
          <Property name="iconClass">fa fa-file-excel-o</Property>
          <Property name="action">uploadExcel</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
        <ToolBarButton>
          <ClientEvent name="onClick">&#xD;
var url = &quot;/export/download-inout-excel&quot;;&#xD;
window.open(url);&#xD;</ClientEvent>
          <Property name="caption">模板下载</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="iconClass">fa fa-cloud-download</Property>
          <Property name="width">120</Property>
        </ToolBarButton>
      </ToolBar>
@@ -685,15 +696,6 @@
          <Property name="align">center</Property>
          <Property name="width">100</Property>
        </DataColumn>
        <DataColumn id="recordWeight">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
          <Property name="property">recordWeight</Property>
          <Property name="align">center</Property>
          <Property name="width">100</Property>
          <Property name="visible">true</Property>
          <Property name="name">recordWeight</Property>
        </DataColumn>
        <DataColumn name="progress">
          <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
@@ -718,7 +720,7 @@
    <Dialog id="dialogMain" layout="regionPadding:8">
      <Property name="iconClass">fa fa-tasks</Property>
      <Property name="caption">单据信息</Property>
      <Property name="width">70%</Property>
      <Property name="width">80%</Property>
      <Property name="closeable">false</Property>
      <Property name="height">90%</Property>
      <Buttons>
@@ -756,7 +758,7 @@
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,*,*</Property>
              <Property name="cols">*,*,*,*</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">：</Property>
              <Property name="labelWidth">100</Property>
@@ -770,7 +772,7 @@
                <Property name="property">plateNum</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Property name="readOnly">true</Property>
@@ -780,6 +782,11 @@
                <Property name="name">depotId</Property>
                <Property name="property">depotId</Property>
                <Property name="label">装卸仓库</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -793,29 +800,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">perWet</Property>
                <Property name="property">perWet</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">userContact</Property>
                <Property name="property">userContact</Property>
                <Property name="label">联系电话</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">foodLevel</Property>
                <Property name="property">foodLevel</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">perImpurity</Property>
                <Property name="property">perImpurity</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
@@ -831,6 +817,12 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">userContact</Property>
                <Property name="property">userContact</Property>
                <Property name="label">联系电话</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="label">客户名称</Property>
                <Property name="property">customerName</Property>
                <Property name="editable">false</Property>
@@ -842,6 +834,16 @@
                <Property name="property">noticeId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">perWet</Property>
                <Property name="property">perWet</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">perImpurity</Property>
                <Property name="property">perImpurity</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
@@ -851,76 +853,70 @@
          <Children>
            <AutoForm>
              <Property name="dataSet">dsMain</Property>
              <Property name="cols">*,50,*,50,*,50</Property>
              <Property name="cols">*,*,*,*</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelWidth">100</Property>
              <Property name="labelSeparator">：</Property>
              <AutoFormElement layoutConstraint="colSpan:2">
                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
                <Property name="name">fullWeight</Property>
                <Property name="property">fullWeight</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <Property name="name">fullWeightTime</Property>
                <Property name="property">fullWeightTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <Property name="name">fullWeightUser</Property>
                <Property name="property">fullWeightUser</Property>
                <Property name="label">满车称重人</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
                <Property name="name">emptyWeight</Property>
                <Property name="property">emptyWeight</Property>
                <Property name="name">fullWeight</Property>
                <Property name="property">fullWeight</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">emptyWeightTime</Property>
                <Property name="property">emptyWeightTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">emptyWeightUser</Property>
                <Property name="property">emptyWeightUser</Property>
                <Property name="label">空车称重人</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">netWeight</Property>
                <Property name="property">netWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
                <Property name="name">deOther</Property>
                <Property name="property">deOther</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <Property name="name">emptyWeightTime</Property>
                <Property name="property">emptyWeightTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">emptyWeightUser</Property>
                <Property name="property">emptyWeightUser</Property>
                <Property name="label">空车称重人</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
                <Property name="name">emptyWeight</Property>
                <Property name="property">emptyWeight</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">netWeight</Property>
                <Property name="property">netWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">registerTime</Property>
                <Property name="property">registerTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
              <AutoFormElement>
                <Property name="name">completeTime</Property>
                <Property name="property">completeTime</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">settleWeight</Property>
                <Property name="property">settleWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">recordWeight</Property>
                <Property name="property">recordWeight</Property>
                <Property name="readOnly">true</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
                <Property name="name">completeTime</Property>
                <Property name="property">completeTime</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
@@ -984,14 +980,14 @@
      <Buttons>
        <Button>
          <ClientEvent name="onClick">todoError();</ClientEvent>
          <Property name="caption">异常终止</Property>
          <Property name="caption">确认作废</Property>
          <Property name="iconClass">fa fa-check</Property>
          <Property name="exClassName">btn1</Property>
          <Property name="width">120</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).close();</ClientEvent>
          <Property name="caption">取消操作</Property>
          <Property name="caption">取消</Property>
          <Property name="exClassName">btn3</Property>
          <Property name="iconClass">fa fa-times-circle</Property>
          <Property name="width">120</Property>
@@ -1176,5 +1172,26 @@
      </Container>
    </CustomDropDown>
    <YearDropDown id="yearDropDown"/>
    <UploadAction id="uploadExcel">
      <ClientEvent name="onFileUploaded">var fileName = arg.returnValue;&#xD;
if(fileName){&#xD;
    $notify(&quot;附件上传成功，开始执行解析……&quot;);&#xD;
    view.get(&quot;#ajaxAnalysisExcel&quot;).set(&quot;parameter&quot;,fileName).execute(function(result){&#xD;
        if(&quot;200&quot;!=result.code){
            $alert(result.message);&#xD;
        }else{
            $alert(result.message);&#xD;
            query();&#xD;
        }
    });&#xD;
}</ClientEvent>
      <Property name="fileResolver">fileUploadManage#uploadExcel</Property>
      <Property name="maxFileSize">10MB</Property>
      <Filters/>
    </UploadAction>
    <AjaxAction id="ajaxAnalysisExcel">
      <Property name="service">inoutDataPR#analysisExcel</Property>
      <Property name="executingMessage">正在执行解析……</Property>
    </AjaxAction>
  </View>
</ViewConfig>