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

src/main/java/com/baosight/hggp/common/AllotTypeEnum.java

+package com.baosight.hggp.common;
+
+import com.baosight.iplat4j.core.ei.EiBlock;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/5/29
+ */
+public enum AllotTypeEnum {
+
+    ZZN(1,"组织内"),
+    ZZJ(2,"组织间");
+
+    private Integer code;
+
+    private String value;
+
+    AllotTypeEnum(Integer code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    public static EiBlock generatorEiBlock() {
+        EiBlock block = new EiBlock("allot_type_block_id");
+        List<Map<String, Object>> rows = new ArrayList<Map<String, Object>>() {{
+            add(new HashMap<String, Object>() {{
+                put(HGConstants.TEXT_FIELD, ZZN.value);
+                put(HGConstants.VALUE_FIELD, ZZN.code);
+            }});
+            add(new HashMap<String, Object>() {{
+                put(HGConstants.TEXT_FIELD, ZZJ.value);
+                put(HGConstants.VALUE_FIELD, ZZJ.code);
+            }});
+        }};
+        block.setRows(rows);
+        return block;
+    }
+
+    public static AllotTypeEnum getEnumByCode(Integer code){
+        for (AllotTypeEnum en : AllotTypeEnum.values()){
+            if(code.compareTo(en.code)==0){
+                return en;
+            }
+        }
+        return null;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -123,6 +123,20 @@ public enum DdynamicEnum {
 	 */
 	SPEC_NAME_BLOCK_ID("spec_name_block_id", "spec", "spec", "HGPZ005.queryComboBoxSpecName"),
 
+    /**
+     * 模块：规格
+     * 用途：调拨单下拉框
+     * 编写：ly
+     */
+    INVENT_CODE_BOX_BLOCK_ID("invent_code_box_block_id", "inventCode", "inventName","inventType", "specId", "HGKC010.queryInventCodeBox"),
+
+    /**
+     * 模块：规格
+     * 用途：调拨单下拉框
+     * 编写：ly
+     */
+    SPEC_BOX_BLOCK_ID("spec_box_block_id", "specId", "spec","length", "width","thick","invQty","invUnitWeight","invWeight", "HGKC010.querySpecIdBox"),
+
 	/**
      * 模块：仓库类型
      * 用途：仓库类型下拉框
@@ -138,6 +152,17 @@ public enum DdynamicEnum {
 	WH_RECORD_BLOCK_ID("wh_record_block_id", "whCode", "whName", "HGPZ007.queryComboBox"),
 
     /**
+     * 模块：调拨单
+     * 用途：调拨单下拉框
+     * 编写：ly
+     */
+    WH_RECORD_BOX_BLOCK_ID("wh_record_box_block_id", "whCode", "whName","companyCode","companyName", "HGKC010.queryWhCodeBox",
+            new HashMap<String,Object>(){{
+                put("deleteFlag", CommonConstant.YesNo.NO_0);
+            }}),
+
+
+    /**
      * 模块：仓库档案
      * 用途：仓库档案下拉框 不默认状态
      * 编写：

src/main/java/com/baosight/hggp/hg/constant/HGConstant.java

@@ -115,6 +115,8 @@ public class HGConstant {
 		public static final String CW_SETTLEMENT_NO = "CW_SETTLEMENT_NO";
 		// 销售出库单号
 		public static final String SALE_OUT_CODE = "SALE_OUT_CODE";
+		// 调拨单号
+		public static final String ALLOT_NO = "ALLOT_NO";
 
 		public static final String CW_COLLECTION_NO = "CW_COLLECTION_NO";
 

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC004.xml

@@ -48,6 +48,7 @@
 		STATUS	as "status" <!-- 状态 0-停止 1-启用 -->
 	</sql>
 	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC004A.xml

@@ -61,6 +61,7 @@
 	</sql>
 
 	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/kc/sql/HGKC010.xml

@@ -200,4 +200,44 @@
         WHERE ID = #id#
     </update>
 
+    <!--仓库公司下拉框-->
+    <select id="queryWhCodeBox" resultClass="java.util.HashMap">
+        SELECT distinct
+        COMPANY_CODE as "companyCode",  <!-- 公司编码 -->
+        COMPANY_NAME as "companyName",  <!-- 公司名称 -->
+        WH_CODE as "whCode",  <!-- 仓库编码 -->
+        WH_NAME as "whName"  <!-- 仓库名称 -->
+        FROM ${hggpSchema}.HGKC010
+        WHERE 1=1
+        <include refid="condition"/>
+    </select>
+
+    <!--存货名称下拉框-->
+    <select id="queryInventCodeBox" resultClass="java.util.HashMap">
+        SELECT distinct
+        INVENT_TYPE as "inventType",  <!-- 存货类型 -->
+        INVENT_CODE as "inventCode",  <!-- 存货编码 -->
+        INVENT_NAME as "inventName",  <!-- 存货名称 -->
+        SPEC_ID as "specId"  <!-- 规格ID -->
+        FROM ${hggpSchema}.HGKC010
+        WHERE 1=1
+        <include refid="condition"/>
+    </select>
+
+    <!--规格下拉框-->
+    <select id="querySpecIdBox" resultClass="java.util.HashMap">
+        SELECT distinct
+        SPEC_ID as "specId",  <!-- 规格ID -->
+        SPEC as "spec",  <!-- 规格 -->
+        LENGTH as "length",  <!-- 长度 -->
+        WIDTH as "width",  <!-- 宽度 -->
+        THICK as "thick",  <!-- 厚度 -->
+        INV_QTY as "invQty",  <!-- 库存数量 -->
+        INV_UNIT_WEIGHT as "invUnitWeight",  <!-- 库存单重 -->
+        INV_WEIGHT as "invWeight"  <!-- 库存重量 -->
+        FROM ${hggpSchema}.HGKC010
+        WHERE 1=1
+        <include refid="condition"/>
+    </select>
+
 </sqlMap>

src/main/java/com/baosight/hggp/hg/pz/sql/HGPZ005A.xml

@@ -24,6 +24,7 @@
 <sqlMap namespace="HGPZ005A">
 
 	<sql id="condition">
+		<include refid="HGXSDataAuth.authCondition"/>
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/sj/sql/HGSJ001.xml

@@ -311,7 +311,9 @@
 		a.ORG_ENAME as "orgEname",
 		a.ORG_CNAME as "orgCname"
 		from ${platSchema}.txsog01 a
-		left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
+		<isNotEmpty prepend="AND" property="userId">
+			left join ${platSchema}.txsog02 b on a.ORG_ID = b.ORG_ID
+		</isNotEmpty>
 		where 1=1
 		<isNotEmpty prepend=" AND " property="accountCode">
 			a.ACCOUNT_CODE = #accountCode#

src/main/resources/resources/ibatis/sqlmap-config.xml

@@ -28,6 +28,8 @@
     <sqlMap resource="com/baosight/hggp/hg/kc/sql/HGKC004A.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/kc/sql/HGKC010.xml"/>
     <sqlMap resource="com/baosight/hggp/hg/kc/sql/HGKC011.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/kc/sql/HGKC013.xml"/>
+    <sqlMap resource="com/baosight/hggp/hg/kc/sql/HGKC013A.xml"/>
     <!-- 质量 -->
     <sqlMap resource="com/baosight/hggp/hg/zl/sql/HGZL001.xml"/>
     <!-- 生产 -->

src/main/webapp/HG/KC/HGKC004.js

@@ -29,10 +29,10 @@ $(function () {
                 e.preventDefault();
                 save();
             },
-        },
-        onSuccess: function (e) {
-            if(e.eiInfo.extAttr.methodName == 'delete' ){
-                query();
+            onSuccess: function (e) {
+                if(e.eiInfo.extAttr.methodName == 'delete' ){
+                    query();
+                }
             }
         }
     }

src/main/webapp/HG/KC/HGKC004A.jsp

@@ -14,7 +14,7 @@
 <script>
     var ctx = "${ctx}";
 </script>
-<EF:EFPage title="存货档案">
+<EF:EFPage title="销售出库单详情">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFSelect cname="存货类型" ename="inqu_status-0-inventType" colWidth="3" filter="contains">