Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC013.xml

@@ -14,13 +14,13 @@
             ha.length as "length",
             ha.width as "width",
             ha.thick as "thick",
-            ha.quantity as "quantity",
-            ha.single_weight as "singleWeight",
-            ha.total_weight as "totalWeight",
-            ha.DEPOSIT_DATE as "depositDate",
-            ha.INV_QTY as "invQty",
-            ha.INV_UNIT_WEIGHT as "invUnitWeight",
-            ha.INV_WEIGHT as "invWeight",
+        ifnull(ha.quantity,0) as "quantity",
+        ifnull(ha.single_weight,0) as "singleWeight",
+        ifnull(ha.total_weight,0) as "totalWeight",
+        ha.DEPOSIT_DATE as "depositDate",
+        ifnull(ha.INV_QTY,0) as "invQty",
+        ifnull(ha.INV_UNIT_WEIGHT,0) as "invUnitWeight",
+        ifnull(ha.INV_WEIGHT,0) as "invWeight",
 
             hb.product_code as "clproductCode" ,
             hb.product_name as "clproductName",
@@ -28,12 +28,12 @@
             hb.length as "cllength",
             hb.width as "clwidth",
             hb.thick as "clthick",
-            hb.quantity as "clquantity",
-            hb.total_weight as "cltotalWeight",
+        ifnull(hb.quantity,0) as "clquantity",
+        ifnull(hb.total_weight,0) as "cltotalWeight",
 
             hb.RECEIPT_DATE as "receiptDate",
-            hb.INV_QTY as "llinvQty",
-            hb.INV_WEIGHT as "llinvWeight",
+        ifnull(hb.INV_QTY,0) as "llinvQty",
+        ifnull(hb.INV_WEIGHT,0) as "llinvWeight",
             case when ifnull(ha.INV_WEIGHT,0)>0 and ifnull(hb.INV_WEIGHT,0)>0 then round((ifnull(ha.INV_WEIGHT,0)*1.0000) /  (ifnull(hb.INV_WEIGHT,0)* 1.0000),4)*100 else 0 end "ccl"
         from
             (

src/main/webapp/HG/BI/components/hipi/002/left-manage-cockpit.vue

@@ -167,7 +167,7 @@ module.exports = {
       var inInfo = new EiInfo();
 
       inInfo.set('inqu_status-0-factoryCode',this.factory)
-      inInfo.set('inqu_status-0-depositDate',this.dataPicker)
+      inInfo.set('inqu_status-0-depositDate',this.datapicker)
       IPLAT.EiCommunicator.send('HGSC007', 'queryBySunWt', inInfo, {
             onSuccess: function (res) {
               console.log(res,'显示的数据')

src/main/webapp/HG/WD/HGWD001.js

@@ -733,9 +733,11 @@ function uploadFile() {
         message("当前节点不可上传附件！");
         return;
     }
+    let filePath = IPLATUI.EFTree.categoryTree.selectTreeNode.filePath;
     JSColorbox.open({
         href: "HGWD099A?methodName=initLoad&inqu_status-0-bizType=WD" +
             "&inqu_status-0-bizId="+$("#inqu_status-0-parentId").val()+"" +
+            "&inqu_status-0-filePath="+filePath+"" +
             "&inqu_status-0-operType=add" +
             "&efParentFormEname=HGWD001",
         title: "<div style='text-align: center;'>附件上传</div>",
@@ -798,26 +800,25 @@ function uploadFileCallback(data) {
     inEiInfo.set("result-0-ndocId", data.ndocId);
     inEiInfo.set("inqu_status-0-fileId", data.bizId);
     inEiInfo.set("result-0-changeContent", data.changeContent);
-    inEiInfo.set("result-0-filePath", IPLATUI.EFTree.categoryTree.selectTreeNode.filePath);
+    inEiInfo.set("result-0-filePath", data.filePath);
     let serviceName = data.operType == "add" ? "HGWD099" : "HGWD001";
     let methodName = data.operType == "add" ? "insert" : "updateFile";
 
 	EiCommunicator.send(serviceName, methodName, inEiInfo, {
 		onSuccess(response) {
-		    if (response.getStatus() == 1){
-                NotificationUtil(ei, "error");
+		    if (response.getStatus() == -1){
+                NotificationUtil(response, "error");
             }else {
                 JSColorbox.close();
                 resultGrid.dataSource.page(1);
-                editCallback();
+                editCallback(data.bizId);
             }
-
         },
         onFail(errorMessage, status, e) {
             NotificationUtil("执行失败！", "error");
         }
     }, {
-        async: false
+        async: true
     });
 }
 

src/main/webapp/HG/WD/HGWD099A.js

@@ -9,11 +9,12 @@ $(function () {
                     return;
                 }
                 $("#fileDocId").val(docId);
-                NotificationUtil("附件上传成功");
+                //NotificationUtil("附件上传成功");
                 var matId = $("#inqu_status-0-bizId").val();
                 var bizType = $("#inqu_status-0-bizType").val();
                 var operType = $("#inqu_status-0-operType").val();
                 var ndocId = $("#inqu_status-0-ndocId").val();
+                var filePath = $("#inqu_status-0-filePath").val();
                 var typeIndex = e.response.docName.lastIndexOf(".");
                 var type = typeIndex == -1 ? e.response.docType : e.response.docName.substring(typeIndex);
                 var data = {
@@ -23,7 +24,8 @@ $(function () {
                     bizId: matId,
                     bizType: bizType,
                     operType: operType,
-                    ndocId: ndocId
+                    ndocId: ndocId,
+                    filePath: filePath
                 }
                 // saveTemp(e);
                 try {

src/main/webapp/HG/WD/HGWD099A.jsp

@@ -17,6 +17,7 @@
   <EF:EFInput cname="文件ID" ename="ndocId" blockId="inqu_status" row="0" type="hidden"/>
   <EF:EFInput cname="操作类型" ename="operType" blockId="inqu_status" row="0" type="hidden"/>
   <EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden"/>
+  <EF:EFInput cname="文件路径" ename="filePath" blockId="inqu_status" row="0" type="hidden"/>
   <EF:EFRegion id="result">
     <EF:EFUpload blockId="result" ename="uploadFile" docTag="wd_file" path="upload"/>
   </EF:EFRegion>