1.fixBug:生产领料

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC008.java

@@ -12,7 +12,12 @@ import com.baosight.hggp.hg.kc.tools.HGKCTools;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ004;
 import com.baosight.hggp.hg.xs.domain.Company;
-import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.ErrorCodeUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.ObjectUtils;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -24,7 +29,11 @@ import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 
 /**
@@ -37,11 +46,12 @@ public class ServiceHGKC008 extends ServiceBase {
         try {
             inInfo = super.query(inInfo, HGKC008.QUERY, new HGKC008());
             Map map = new HashMap();
-            map.put(HGKC008.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
-            CommonMethod.initBlock(inInfo,
-                    Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID,DdynamicEnum.PROJ_RECORD_BY_ROLE_BLOCK_ID,DdynamicEnum.WH_RECORD_BOX_BLOCK_ID),map,false
-            );
-            EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+	        map.put(HGKC008.FIELD_ACCOUNT_CODE, UserSessionUtils.getAccountCode());
+	        CommonMethod.initBlock(inInfo,
+			        Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID, DdynamicEnum.PROJ_RECORD_BY_ROLE_BLOCK_ID,
+					        DdynamicEnum.WH_RECORD_BLOCK_ID), map, false
+	        );
+	        EiInfoUtils.addBlock(inInfo, "roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC008B.java

@@ -5,34 +5,28 @@ import com.baosight.hggp.common.DdynamicEnum;
 import com.baosight.hggp.common.InventTypeDetailEnum;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
-import com.baosight.hggp.hg.cg.domain.HGCG002;
-import com.baosight.hggp.hg.cg.domain.HGCG002B;
-import com.baosight.hggp.hg.cg.domain.HGCG003;
-import com.baosight.hggp.hg.cg.tools.HGCGTools;
-import com.baosight.hggp.hg.cg.utils.HGCGUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.kc.domain.HGKC008;
 import com.baosight.hggp.hg.kc.domain.HGKC008A;
 import com.baosight.hggp.hg.kc.domain.HGKC010;
 import com.baosight.hggp.hg.kc.utils.HGKCUtils;
-import com.baosight.hggp.hg.pz.domain.HGPZ005;
-import com.baosight.hggp.hg.pz.domain.HGPZ007;
 import com.baosight.hggp.hg.xs.domain.Company;
-import com.baosight.hggp.hg.yx.domain.HGYX001A;
-import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.BeanUtils;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.MapUtils;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
-import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
-import com.baosight.iplat4j.core.service.soa.XLocalManager;
-import com.baosight.iplat4j.core.util.DateUtils;
-import com.baosight.iplat4j.core.web.threadlocal.UserSession;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 
-import java.math.BigDecimal;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author:songx
@@ -53,10 +47,10 @@ public class ServiceHGKC008B extends ServiceBase {
 			Map<String, Object> paramMap = new HashMap<>();
 			paramMap.put("inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID),paramMap);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID),paramMap);
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID),paramMap);
-			EiInfoUtils.addBlock(inInfo,"roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BLOCK_ID), paramMap);
+//			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID), paramMap);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), null);
+			EiInfoUtils.addBlock(inInfo, "roleCompany", UserSessionUtils.getRoleCompany(), Company.class);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC010().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
@@ -75,7 +69,7 @@ public class ServiceHGKC008B extends ServiceBase {
 	public EiInfo query(EiInfo inInfo) {
 		try {
 			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
+//			inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "inventTypeDetails", InventTypeDetailEnum.getInentTypeTwo());
 			inInfo = super.query(inInfo, HGKC010.QUERY, new HGKC010());
 		} catch (Exception e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");

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

@@ -69,7 +69,7 @@
             INVENT_CODE = #inventCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="inventName">
-            INVENT_NAME = #inventName#
+            INVENT_NAME LIKE CONCAT('%', #inventName#, '%')
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="specId">
             SPEC_ID = #specId#

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

@@ -2,7 +2,7 @@ $(function (){
 
     var companyCodes = __eiInfo.getBlock("roleCompany").getMappedRows();
     var projCodes = __eiInfo.getBlock("projRecordByRole_block_id").getMappedRows();
-    var whRecordBoxBlocks = __eiInfo.getBlock("wh_record_box_block_id").getMappedRows();
+    var whRecordBoxBlocks = __eiInfo.getBlock("wh_record_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");
 

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

@@ -26,7 +26,7 @@
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" copyToAdd="false">
+        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" copyToAdd="false" checkMode="row">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="receiveId" cname="领料单id" hidden="true"/>
             <EF:EFColumn ename="whCode" cname="仓库编码" hidden="true"/>

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

@@ -51,7 +51,7 @@ let confirm = function () {
 			return;
 		}
 	}
-	JSUtils.confirm("确定对勾选的[" + rows.length + "]条数据生成\"采购收货\"吗? ", {
+	JSUtils.confirm("确定对勾选的[" + rows.length + "]条数据进行\"生产领料\"操作吗? ", {
 		ok: function () {
 			JSUtils.submitGridsData("result", "HGKC008B", "confirm",
 				true, function (e) {

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

@@ -18,10 +18,11 @@
 			             optionLabel="全部" defultValue="" filter="contains">
 				<EF:EFOptions blockId="invent_type_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
-			<EF:EFSelect cname="存货编号" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"
-						 filter="contains" optionLabel="全部" defultValue="" template="[#=valueField#]#=textField#">
-				<EF:EFOptions blockId="invent_record_block_id" textField="textField"  valueField="valueField"/>
-			</EF:EFSelect>
+				<%--			<EF:EFSelect cname="存货编号" blockId="inqu_status" ename="inventCode" row="0" colWidth="3"--%>
+				<%--						 filter="contains" optionLabel="全部" defultValue="" template="[#=valueField#]#=textField#">--%>
+				<%--				<EF:EFOptions blockId="invent_record_block_id" textField="textField"  valueField="valueField"/>--%>
+				<%--			</EF:EFSelect>--%>
+			<EF:EFInput cname="存货名称" ename="inventName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>
 	</EF:EFRegion>