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

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC004A.java

@@ -281,7 +281,7 @@ public class ServiceHGSC004A extends ServiceBase {
      */
     private void submitPlanEntity(HGSC004 hgsc004, Boolean flag, List<HGSC004A> hgsc004AList) {
         List<String> inventCodes = hgsc004AList.stream().map(HGSC004A::getProductCode).collect(Collectors.toList());
-        List<HGPZ005> hgpz005List = HGPZTools.HgPz005.listByInventCodes(inventCodes);
+        List<HGPZ005> hgpz005List =  HGPZTools.HgPz005.listByInventCodes(inventCodes);
         //第一次全部提交
         if(flag){
             //主表
@@ -295,6 +295,8 @@ public class ServiceHGSC004A extends ServiceBase {
             //加工的才生成生产计划
             mapA.put("inventSource", HGConstant.InventSource.JG);
             hgsc004AList = dao.query(HGSC004A.QUERY_BY_MATERIAL_ID,mapA, 0, -999999);
+            inventCodes = hgsc004AList.stream().map(HGSC004A::getProductCode).collect(Collectors.toList());
+            hgpz005List = HGPZTools.HgPz005.listByInventCodes(inventCodes);
             List<HGSC005A> hgsc005AList = new LinkedList<>();
             for(HGSC004A hgsc004A : hgsc004AList){
                 //全部提交后的增加、修改

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC013.java

@@ -39,8 +39,8 @@ public class ServiceHGSC013 extends ServiceEPBase {
     public EiInfo query(EiInfo inInfo) {
         try {
             Map queryMap = EiInfoUtils.getFirstRow(inInfo);
-            if (queryMap.containsKey("contractDate")){
-                queryMap.put("contractDate", DateUtils.formatShort(queryMap.get("contractDate")));
+            if (queryMap.containsKey("receiptDate")){
+                queryMap.put("receiptDate", DateUtils.formatShort(queryMap.get("receiptDate")));
             }
             List<Map> list = DaoBase.getInstance().query("HGSC013.query", queryMap);
             inInfo.set(EiConstant.resultBlock, list);

src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java

@@ -245,7 +245,7 @@ public class HGSCTools {
          * @return
          */
         public static HGSC001 getByCode(String code) {
-            AssertUtils.isNull(code, "项目Code不能为空！");
+            AssertUtils.isEmpty(code, "项目Code不能为空！");
             Map queryMap = new HashMap();
             queryMap.put(HGSC001.FIELD_proj_code, code);
             queryMap.put("notAuth", true);
@@ -259,7 +259,7 @@ public class HGSCTools {
          * @return
          */
         public static HGSC001 queryByCode(String code) {
-            AssertUtils.isNull(code, "项目Code不能为空！");
+            AssertUtils.isEmpty(code, "项目Code不能为空！");
             List<HGSC001> results = DaoBase.getInstance().query(HGSC001.QUERY, new HashMap<String, Object>() {
                 {
                     put("projCode", code);

src/main/webapp/HG/SC/HGSC013.jsp

@@ -68,7 +68,7 @@
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
             </EF:EFSelect>
-<%--            <EF:EFDatePicker blockId="inqu_status" row="0" ename="contractDate" cname="委外加工日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>--%>
+            <EF:EFDatePicker blockId="inqu_status" row="0" ename="depositDate" cname="入库日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
 
@@ -100,7 +100,7 @@
                     </thead>
                     <tbody>
                     <tr v-for="(valObj,i) in list" :key="i">
-                        <td v-for="(item,k) in columns2" :key="k" v-if="valObj[item.value].show && k>0" :rowspan="valObj[item.value].rowspan" :class="i/2%1?'bg-blue':''">
+                        <td v-for="(item,k) in columns2" :key="k" v-if="valObj[item.value].show && k>0" :rowspan="valObj[item.value].rowspan" :class="i/2%1?'bg-blue':''" :style="{textAlign:item.align}">
                             <span>{{valObj[item.value].value}}</span>
                         </td>
                     </tr>

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

@@ -353,6 +353,6 @@ let preview = function () {
  * @param docName
  */
 let showPreview = function (docId, docType, docName) {
-	let fileId = IPLATUI.EFTree.categoryTree.selectTreeNode.fileId;
+	let fileId = IPLATUI.EFTree.docTree.selectTreeNode.fileId;
 	addRecordWindow(fileId, docId, docType, docName);
 }