Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

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

@@ -11,16 +11,26 @@ import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.constant.HGSqlConstant;
 import com.baosight.hggp.hg.cw.tools.HGCWTools;
 import com.baosight.hggp.hg.cw.vo.UserVO;
-import com.baosight.hggp.hg.kc.domain.*;
+import com.baosight.hggp.hg.kc.domain.HGKC005;
+import com.baosight.hggp.hg.kc.domain.HGKC006;
+import com.baosight.hggp.hg.kc.domain.HGKC006A;
+import com.baosight.hggp.hg.kc.domain.HGKC007;
+import com.baosight.hggp.hg.kc.domain.HGKC007A;
 import com.baosight.hggp.hg.kc.tools.HGKCTools;
-import com.baosight.hggp.hg.kc.utils.HGKCUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ005;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
-import com.baosight.hggp.hg.sc.domain.HGSC004A;
-import com.baosight.hggp.hg.sc.tools.HGSCTools;
 import com.baosight.hggp.hg.xs.utils.HGXSUtils;
 import com.baosight.hggp.hg.yx.domain.HGYX001;
-import com.baosight.hggp.util.*;
+import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.CommonMethod;
+import com.baosight.hggp.util.DateUtils;
+import com.baosight.hggp.util.EiInfoUtils;
+import com.baosight.hggp.util.ErrorCodeUtils;
+import com.baosight.hggp.util.ExcelUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.ObjectUtils;
+import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.StringUtils;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -32,7 +42,11 @@ import com.baosight.iplat4j.ed.util.SequenceGenerator;
 import org.apache.commons.collections.MapUtils;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author LiuYang
@@ -62,9 +76,9 @@ public class ServiceHGKC005 extends ServiceEPBase {
                     DdynamicEnum.SPEC_RECORD_BLOCK_ID,
                     DdynamicEnum.INVENT_TYPE_BLOCK_ID), queryMap);
             inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGKC005().eiMetadata);
-            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_COMPANY_CODE, userVO.getUsercode());
-            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGYX001.FIELD_COMPANY_NAME, userVO.getUsername());
+//            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+//            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGYX001.FIELD_COMPANY_CODE, userVO.getUsercode());
+//            inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGYX001.FIELD_COMPANY_NAME, userVO.getUsername());
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }

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

@@ -364,7 +364,7 @@
 
     <!-- 抛送状态修改-->
     <update id="updateBillStatus">
-        UPDATE ${wggzSchema}.HGPZ022
+        UPDATE ${hggpSchema}.HGPZ022
         SET
         BILL_STATUS = #billStatus# <!-- 抛送状态：00:未抛送 10:发送中 20:抛帐成功 30:抛帐失败   -->
         WHERE BILL_MAIN_ID = #billMainId#

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL003.java

@@ -110,7 +110,12 @@ public class ServiceHGZL003 extends ServiceBase {
 		newZl003.setCheckCode(SequenceGenerator.getNextSequence(HGConstant.SequenceId.HGZL003_CHECK_CODE));
 		newZl003.setCheckBy(UserSessionUtils.getLoginName());
 		newZl003.setCheckName(UserSessionUtils.getLoginCName());
-		newZl003.setCheckDate(DateUtils.shortDate());
+		newZl003.setCheckDate(DateUtils.formatShort(fZl003.getCheckDate()));
+		newZl003.setQuantity(fZl003.getQuantity());
+		newZl003.setUnpassQuantity(fZl003.getUnpassQuantity());
+		newZl003.setPassQuantity(fZl003.getQuantity() - fZl003.getUnpassQuantity());
+		newZl003.setWorkBy(fZl003.getWorkBy());
+		newZl003.setWorkName(fZl003.getWorkName());
 		DaoUtils.insert(HGZL003.INSERT, newZl003);
 		// 生成整改通知单
 		HGZLTools.HgZl004.addByHGZL003(newZl003);

src/main/webapp/HG/ZL/HGZL003.jsp

@@ -37,7 +37,7 @@
 			<EF:EFColumn ename="taskCode" cname="生产任务单号" width="130" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="checkCode" cname="质检单号" width="130" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="checkDate" cname="质检日期" width="120" align="center" editType="date"
-			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd', 'yyyy-MM-dd']" required="true"/>
 			<EF:EFColumn ename="processName" cname="工序" width="100" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="productCode" cname="存货编码" width="90" enable="false" readonly="true" align="center"/>
 			<EF:EFColumn ename="productName" cname="存货名称" width="90" enable="false" readonly="true" align="center"/>