Merge remote-tracking branch 'origin/dev' into dev

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

@@ -13,8 +13,8 @@
             h.INVENT_CODE	as "lcinventCode",  <!-- 原料编码 -->
             h.INVENT_NAME	as "lcinventName",  <!-- 原料名称 -->
             h.SPEC_CL as "lcspec",
-            h.OUT_QTY	as "jhckQty",  <!-- 出库数量 -->
-            h.OUT_WEIGHT	as "jhckWeight",  <!-- 出库重量 -->
+            h.PCS_QTY	as "jhckQty",  <!-- 加工数量 -->
+            h.PCS_WEIGHT	as "jhckWeight",  <!-- 加工重量 -->
             hd.OUT_DATE	as "outDate",  <!-- 出库日期 -->
             hd.OUT_QTY	as "sjckoutQty",  <!-- 出库数量 -->
             hd.OUT_WEIGHT	as "sjckoutWeight", <!-- 出库重量 -->
@@ -28,26 +28,26 @@
             hc.DEPOSIT_WEIGHT as "depositWeight"  <!-- 实际入库重量 -->
         from (
             select
-                 h.COMPANY_CODE	,
-                 h.COMPANY_NAME	,
-                 h.CONTRACT_DATE	,
-                 h.CONTRACT_CODE	,
-                 h.SUP_CODE	,
-                     h.SUP_NAME	,
-                     h.SUB_STATUS,
-                     hb.INVENT_CODE	,
-                     hb.INVENT_NAME	,
-                     hb.SPEC as "SPEC_CL",
-                     hb.OUT_QTY	,
-                     hb.OUT_WEIGHT	,
-                     ha.PRODUCT_CODE ,
-                     ha.PRODUCT_NAME ,
-                     ha.SPEC as "SPEC_CP",
-                     ha.DEPOSIT_QTY ,
-                     ha.DEPOSIT_WEIGHT
-                 from hggp.hgsc010 h
-                          left join hggp.hgsc010a ha on h.ID = ha.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE
-                          left join hggp.hgsc010b hb on h.ID = hb.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE and ha.INVENT_CODE = hb.INVENT_CODE
+                h.COMPANY_CODE	,
+                h.COMPANY_NAME	,
+                h.CONTRACT_DATE	,
+                h.CONTRACT_CODE	,
+                h.SUP_CODE	,
+                h.SUP_NAME	,
+                h.SUB_STATUS,
+                hb.INVENT_CODE	,
+                hb.INVENT_NAME	,
+                hb.SPEC as "SPEC_CL",
+                hb.PCS_QTY	,
+                hb.PCS_WEIGHT	,
+                ha.PRODUCT_CODE ,
+                ha.PRODUCT_NAME ,
+                ha.SPEC as "SPEC_CP",
+                ha.PCS_QTY as DEPOSIT_QTY ,
+                ha.PCS_WEIGHT DEPOSIT_WEIGHT
+            from hggp.hgsc010 h
+            left join hggp.hgsc010a ha on h.ID = ha.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE
+            left join hggp.hgsc010b hb on h.ID = hb.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE and ha.INVENT_CODE = hb.INVENT_CODE
                  where h.SUB_STATUS = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     h.ACCOUNT_CODE = #accountCode#

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

@@ -34,6 +34,8 @@ $(function () {
 $(window).load(function () {
     // 查询
     query();
+
+    showAuthButton();
 });
 
 /**
@@ -164,3 +166,42 @@ let checkSelectMain = function () {
     }
     return true;
 }
+
+/**
+ * 显示授权按钮
+ */
+let showAuthButton = function () {
+    let label = IPLAT.EFInput.value($("#inqu_status-0-fileId"))
+    // C:目录
+    $("#SAVE").hide();
+    $("#AUTH").hide();
+    $("#REMOVE_USER").hide();
+    $("#COPY_USER").hide();
+    // 管理员或者是项目经理，才能进行授权和操作用户
+    let inInfo = new EiInfo();
+    inInfo.set("inqu_status-0-fileId", label);
+    EiCommunicator.send('HGWD003', 'isProjectManager', inInfo, {
+        onSuccess: function (res) {
+            let status = res.getStatus();
+            if (status >= 0 && res.extAttr.isManager == 1) {
+                $("#AUTH").show();
+                $("#REMOVE_USER").show();
+                $("#COPY_USER").show();
+                $("#SAVE").show();
+            } else if (status >= 0 && res.extAttr.isProjectManager == 1) {
+                $("#AUTH").show();
+                $("#REMOVE_USER").show();
+                $("#COPY_USER").show();
+                $("#SAVE").hide();
+            } else {
+                $("#SAVE").hide();
+                $("#AUTH").hide();
+                $("#REMOVE_USER").hide();
+                $("#COPY_USER").hide();
+            }
+        },
+        onFail: function (res) {
+            NotificationUtil("操作失败，原因[" + res.getMsg() + "]", "error");
+        }
+    });
+}