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

src/main/java/com/baosight/hggp/hg/yx/domain/HGYX002C.java

+package com.baosight.hggp.hg.yx.domain;
+
+import com.baosight.iplat4j.core.data.DaoEPBase;
+
+/**
+ * @author LiuYang
+ * @version 1.0 2024/6/11
+ */
+public class HGYX002C extends DaoEPBase {
+
+    public static final String QUERY = "HGYX002C.query";
+    public static final String COUNT = "HGYX002C.count";
+}

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX001A.java

@@ -48,7 +48,7 @@ public class ServiceHGYX001A extends ServiceEPBase {
         }
         outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "type", type);
         UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-        outInfo.getBlock(EiConstant.resultBlock).setBlockMeta(new HGYX001().eiMetadata);
+        outInfo.getBlock(EiConstant.resultBlock).setBlockMeta(new HGYX001A().eiMetadata);
         CommonMethod.initBlock(outInfo,
                 Arrays.asList(
                         DdynamicEnum.COMPANY_BOX_BLOCK_ID,

src/main/java/com/baosight/hggp/hg/yx/service/ServiceHGYX002C.java

@@ -5,6 +5,7 @@ import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.hg.yx.domain.HGYX001;
 import com.baosight.hggp.hg.yx.domain.HGYX001A;
 import com.baosight.hggp.hg.yx.domain.HGYX001C;
+import com.baosight.hggp.hg.yx.domain.HGYX002C;
 import com.baosight.hggp.hg.yx.tools.HGYXTools;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
@@ -43,13 +44,12 @@ public class ServiceHGYX002C extends ServiceEPBase {
             AssertUtils.isEmpty(hgYx001s, "未找到对应发货单号");
             inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELIVERY_CODE, hgYx001s.get(0).getDeliveryCode());
         }
-        inInfo = super.query(inInfo, HGYX001A.QUERY, new HGYX001A());
+        inInfo = super.query(inInfo, HGYX002C.QUERY, new HGYX001A());
         CommonMethod.initBlock(inInfo,
                 Arrays.asList(
                         DdynamicEnum.INVENT_TYPE_BLOCK_ID,
                         DdynamicEnum.INVENT_RECORD_BLOCK_ID,
                         DdynamicEnum.SPEC_NAME_BLOCK_ID));
-        inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGYX001A().eiMetadata);
 
         return inInfo;
     }
@@ -57,6 +57,6 @@ public class ServiceHGYX002C extends ServiceEPBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_DELETE_FLAG, CommonConstant.YesNo.NO_0);
-        return super.query(inInfo, HGYX001C.QUERY,new HGYX001C());
+        return super.query(inInfo, HGYX002C.QUERY,new HGYX001A());
     }
 }

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001.xml

@@ -388,6 +388,7 @@
 			${hggpSchema}.HGYX001
 		WHERE DELETE_FLAG = 0 AND STATUS = 1
 		<include refid="condition" />
+		order by DELIVERY_CODE desc
 	</select>
 
 </sqlMap>

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX001C.xml

@@ -37,7 +37,6 @@
     <sql id="condition">
         <include refid="HGXSDataAuth.authCondition"/>
         <include refid="idCondition"/>
-        <include refid="customCondition"/>
         <isNotEmpty prepend=" AND " property="accountCode">
             ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
@@ -100,10 +99,10 @@
         </isNotEmpty>
     </sql>
 
-    <sql id="customCondition">
+    <!--<sql id="customCondition">
         <include refid="BaseCondition.specCondition"/>
         <include refid="BaseCondition.createdTimeCondition"/>
-    </sql>
+    </sql>-->
 
     <sql id="orderBy">
         <dynamic prepend="ORDER BY">

src/main/java/com/baosight/hggp/hg/yx/sql/HGYX002C.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
-<sqlMap namespace="HGYX002A">
-    <typeAlias alias="HGYX002A" type="com.baosight.hggp.hg.yx.domain.HGYX002A"/>
+<sqlMap namespace="HGYX002C">
+    <typeAlias alias="HGYX002C" type="com.baosight.hggp.hg.yx.domain.HGYX001A"/>
     <sql id="column">
-        ID	as "id",  <!-- ID -->
-        ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
-        DEP_CODE	as "depCode",  <!-- 部门编码 -->
-        CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
-        CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
-        CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
-        UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
-        UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
-        UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
-        DELETE_FLAG	as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
-        INVENT_RECORD_ID	as "inventRecordId",  <!-- 存货档案id -->
-        INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
-        INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
-        INVENT_NAME	as "inventName",  <!-- 存货名称 -->
-        SPEC	as "spec",  <!-- 规格 -->
-        LENGTH	as "length",  <!-- 长 -->
-        WIDTH	as "width",  <!-- 宽 -->
-        THICK	as "thick",  <!-- 厚 -->
-        QUANTITY	as "quantity",  <!-- 发货数量 -->
-        UNIT_WEIGHT	as "unitWeight",  <!-- 单重 -->
-        WEIGHT	as "weight",  <!-- 发货重量 -->
+        A.ID	as "id",  <!-- ID -->
+        A.ACCOUNT_CODE	as "accountCode",  <!-- 企业编码 -->
+        A.DEP_CODE	as "depCode",  <!-- 部门编码 -->
+        A.CREATED_BY	as "createdBy",  <!-- 记录创建者 -->
+        A.CREATED_NAME	as "createdName",  <!-- 记录创建名称 -->
+        A.CREATED_TIME	as "createdTime",  <!-- 记录创建时间 -->
+        A.UPDATED_BY	as "updatedBy",  <!-- 记录修改者 -->
+        A.UPDATED_NAME	as "updatedName",  <!-- 记录修改名称 -->
+        A.UPDATED_TIME	as "updatedTime",  <!-- 记录修改时间 -->
+        A.DELETE_FLAG	as "deleteFlag",  <!-- 0-未删除，1-已删除 -->
+        A.INVENT_RECORD_ID	as "inventRecordId",  <!-- 存货档案id -->
+        A.INVENT_TYPE	as "inventType",  <!-- 存货类型 -->
+        A.INVENT_CODE	as "inventCode",  <!-- 存货编码 -->
+        A.INVENT_NAME	as "inventName",  <!-- 存货名称 -->
+        A.SPEC	as "spec",  <!-- 规格 -->
+        A.LENGTH	as "length",  <!-- 长 -->
+        A.WIDTH	as "width",  <!-- 宽 -->
+        A.THICK	as "thick",  <!-- 厚 -->
+        A.QUANTITY	as "quantity",  <!-- 发货数量 -->
+        A.UNIT_WEIGHT	as "unitWeight",  <!-- 单重 -->
+        A.WEIGHT	as "weight",  <!-- 发货重量 -->
         '0' as "returnQuantity",  <!-- 退货数量 -->
         '0'	as "returnWeight",  <!-- 退货重量 -->
-        PARENT_ID	as "parentId" <!-- 销售退货ID -->
+        A.PARENT_ID	as "parentId" <!-- 销售退货ID -->
+    </sql>
+    <sql id="authCondition">
+        <!-- 无权限时使用 -->
+        <isNotEmpty prepend=" AND " property="authDepCode">
+            A.DEP_CODE = #authDepCode#
+        </isNotEmpty>
+        <!-- 仅本人和部门组合 -->
+        <isEqual prepend=" AND " property="authCombination" compareValue="1">
+            (A.CREATED_BY = #authOnlyPeople# OR A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>)
+        </isEqual>
+        <!-- 仅本人或部门 -->
+        <isNotEqual prepend=" AND " property="authCombination" compareValue="1">
+            <isNotEmpty property="authOnlyPeople">
+                A.CREATED_BY = #authOnlyPeople#
+            </isNotEmpty>
+            <isNotEmpty property="authDepCodes">
+                A.DEP_CODE IN <iterate close=")" open="(" conjunction="," property="authDepCodes">#authDepCodes[]#</iterate>
+            </isNotEmpty>
+        </isNotEqual>
     </sql>
     <sql id="condition">
-        <include refid="HGXSDataAuth.authCondition"/>
+        <include refid="authCondition"/>
         <isNotEmpty prepend=" AND " property="id">
-            ID = #id#
+            A.ID = #id#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="accountCode">
-            ACCOUNT_CODE = #accountCode#
+            A.ACCOUNT_CODE = #accountCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="depCode">
-            DEP_CODE = #depCode#
+            A.DEP_CODE = #depCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="createdBy">
-            CREATED_BY = #createdBy#
+            A.CREATED_BY = #createdBy#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="createdName">
-            CREATED_NAME = #createdName#
+            A.CREATED_NAME = #createdName#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="createdTime">
-            CREATED_TIME = #createdTime#
+            A.CREATED_TIME = #createdTime#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="updatedBy">
-            UPDATED_BY = #updatedBy#
+            A.UPDATED_BY = #updatedBy#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="updatedName">
-            UPDATED_NAME = #updatedName#
+            A.UPDATED_NAME = #updatedName#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="updatedTime">
-            UPDATED_TIME = #updatedTime#
+            A.UPDATED_TIME = #updatedTime#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="deleteFlag">
-            DELETE_FLAG = #deleteFlag#
+            A.DELETE_FLAG = #deleteFlag#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventRecordId">
-            INVENT_RECORD_ID = #inventRecordId#
+            A.INVENT_RECORD_ID = #inventRecordId#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventType">
-            INVENT_TYPE = #inventType#
+            A.INVENT_TYPE = #inventType#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventCode">
-            INVENT_CODE = #inventCode#
+            A.INVENT_CODE = #inventCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventName">
-            INVENT_NAME = #inventName#
+            A.INVENT_NAME like CONCAT(#inventName#,'%')
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="spec">
-            SPEC = #spec#
+            A.SPEC like CONCAT(#spec#,'%')
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="length">
-            LENGTH = #length#
+            A.LENGTH = #length#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="width">
-            WIDTH = #width#
+            A.WIDTH = #width#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="thick">
-            THICK = #thick#
+            A.THICK = #thick#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="quantity">
-            QUANTITY = #quantity#
+            A.QUANTITY = #quantity#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="weight">
-            WEIGHT = #weight#
+            A.WEIGHT = #weight#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="parentId">
-            PARENT_ID = #parentId#
+            A.PARENT_ID = #parentId#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventRecordIds">
-            INVENT_RECORD_ID NOT IN <iterate close=")" open="(" conjunction="," property="inventRecordIds">#inventRecordIds[]#</iterate>
+            A.INVENT_RECORD_ID NOT IN <iterate close=")" open="(" conjunction="," property="inventRecordIds">#inventRecordIds[]#</iterate>
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="ids">
-            ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
+            A.ID IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
         </isNotEmpty>
     </sql>
 
-    <select id="query" parameterClass="java.util.HashMap" resultClass="HGYX001A">
+    <select id="query" parameterClass="java.util.HashMap" resultClass="HGYX002C">
         SELECT
         <include refid="column" />
-        FROM ${hggpSchema}.HGYX001A WHERE 1=1
+        FROM ${hggpSchema}.HGYX001A A
+        LEFT JOIN ${hggpSchema}.HGYX001 B ON B.ID = A.PARENT_ID
+        WHERE 1=1 AND B.DELIVERY_CODE = #deliveryCode#
         <include refid="condition" />
         <dynamic prepend="ORDER BY">
             <isNotEmpty property="orderBy">
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                CREATED_TIME desc, ID asc
+                A.CREATED_TIME desc, A.ID asc
             </isEmpty>
         </dynamic>
 
     </select>
 
     <select id="count" resultClass="int">
-        SELECT COUNT(*) FROM ${hggpSchema}.HGYX001A WHERE 1=1
+        SELECT COUNT(*) FROM ${hggpSchema}.HGYX001A A
+        LEFT JOIN ${hggpSchema}.HGYX001 B ON B.ID = A.PARENT_ID
+        WHERE 1=1 AND B.DELIVERY_CODE = #deliveryCode#
         <include refid="condition" />
     </select>
 </sqlMap>
\ No newline at end of file

src/main/webapp/HG/YX/HGYX001.jsp

@@ -36,7 +36,7 @@
             </EF:EFSelect>--%>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="审核状态" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
         </div>
     </EF:EFRegion>
@@ -76,8 +76,8 @@
             <EF:EFColumn ename="consAddr" cname="发货地址" hidden="true" width="120" align="center"/>
             <EF:EFColumn ename="consQuantity" cname="发货数量" width="120" align="center" format="{0:N0}" data-rules="number"/>
             <EF:EFColumn ename="consWeight" cname="发货重量" width="120" align="center" format="{0:N3}" data-rules="number"/>
-            <EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" enable="false" defaultValue="0" required="true">
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+            <EF:EFComboColumn ename="status" cname="审核状态" width="80" align="center" enable="false" defaultValue="0" required="true">
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFComboColumn>
         </EF:EFGrid>
     </EF:EFRegion>

src/main/webapp/HG/YX/HGYX001A.jsp

@@ -26,7 +26,7 @@
             <EF:EFInput blockId="inqu_status" row="0" ename="deliveryCode" cname="发货单号" disabled="true" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="outboundCode" cname="出库单号" disabled="true" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="审核状态" colWidth="3" disabled="true" filter="contains" value="0">
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
         </div>
         <div class="row">

src/main/webapp/HG/YX/HGYX002.js

@@ -97,7 +97,7 @@ function add() {
     JSColorbox.open({
         href: "HGYX002A?methodName=initLoad",
         title: "<div style='text-align: center;'>新增销售退货</div>",
-        width: "80%",
+        width: "90%",
         height: "80%",
         callbackName: windowCallback
     });
@@ -117,7 +117,7 @@ function update() {
     JSColorbox.open({
         href: "HGYX002A??methodName=initLoad&inqu_status-0-parentId=" + id + "&inqu_status-0-type=update&efParentFormEname=HGYX002",
         title: "<div style='text-align: center;'>修改销售退货</div>",
-        width: "80%",
+        width: "90%",
         height: "80%",
         callbackName: windowCallback
     });

src/main/webapp/HG/YX/HGYX002.jsp

@@ -22,7 +22,7 @@
             <EF:EFInput blockId="inqu_status" row="0" ename="receName" cname="收货方" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="审核状态" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="companyCode" cname="所属公司" placeholder="模糊查询" type="hidden" colWidth="3"/>
         </div>
@@ -53,8 +53,8 @@
             </EF:EFComboColumn>
             <EF:EFColumn ename="returnQuantity" cname="退货数量" width="120" readonly="true" align="center" format="{0:N0}" data-rules="number"/>
             <EF:EFColumn ename="returnWeight" cname="退货重量" width="120" readonly="true" align="center" format="{0:N3}" data-rules="number"/>
-            <EF:EFComboColumn ename="status" cname="审批状态" width="80" align="center" enable="false" defaultValue="0" required="true">
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+            <EF:EFComboColumn ename="status" cname="审核状态" width="80" align="center" enable="false" defaultValue="0" required="true">
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="companyCode" cname="公司编码" hidden="true"/>
             <EF:EFColumn ename="companyName" cname="公司名称" hidden="true"/>

src/main/webapp/HG/YX/HGYX002A.js

@@ -289,7 +289,7 @@ $(function() {
                 return false;
             }
             if(Math.abs(parseFloat(returnQuantity)) > parseInt(quantity)){
-                message("选中的第" + (index + 1) + "行\"退货数量大于发货数量\"");
+                message("选中的第" + (index + 1) + "行\"退货数量不能大于发货数量\"");
                 flag = false;
                 return false;
             }
@@ -364,7 +364,7 @@ $(function() {
                 return false;
             }
             if(Math.abs(parseFloat(returnQuantity)) > parseInt(quantity)){
-                message("选中的第" + (index + 1) + "行\"退货数量大于发货数量\"");
+                message("选中的第" + (index + 1) + "行\"退货数量不能大于发货数量\"");
                 flag = false;
                 return false;
             }

src/main/webapp/HG/YX/HGYX002A.jsp

@@ -48,7 +48,7 @@
             <EF:EFInput blockId="inqu_status" row="0" ename="receName" type="hidden" cname="收货方名称"  colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="receUserPhone" cname="收货人电话" required="true" data-rules="mobile_phone" placeholder="请输入电话号码" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="status" cname="审核状态" colWidth="3" disabled="true" filter="contains" value="0">
-                <EF:EFCodeOption codeName="hggp.hgsb.approveStatus" condition="ITEM_CODE IN ('0','1')"/>
+                <EF:EFCodeOption codeName="hggp.hgyx.status" condition="ITEM_CODE IN ('0','1')"/>
             </EF:EFSelect>
         </div>
         <div class="row">

src/main/webapp/HG/YX/HGYX002C.jsp

@@ -21,6 +21,7 @@
             <EF:EFInput blockId="inqu_status" row="0" ename="spec" cname="规格" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" type="hidden" required="true" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="whCode" cname="仓库名称" type="hidden" required="true" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="deliveryCode" cname="发货单号" type="hidden" required="true" colWidth="3"/>
         </div>
     </EF:EFRegion>