完善在途的查询

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.supervise.portal.biz.gdinstorage.GdInstorageCountMapper">
     <select id="spdhmxb" resultType="java.util.Map">
-        SELECT NAME,proCode,proName, number ,   packageTotalPrice   ptotalPrice, prodNum , prodValue ,
+        SELECT name,proCode,proName, number ,   packageTotalPrice   ptotalPrice, prodNum , prodValue ,
                number-prodNum  ztnumber,
                IF((  packageTotalPrice  -  prodValue  )>0,  packageTotalPrice  -  prodValue  ,0) ztprodValue1,
                IF((  prodValue -  packageTotalPrice  )>0,  prodValue  - packageTotalPrice  ,0) ztprodValue2
@@ -11,8 +11,7 @@
                         (SELECT  CONVERT(IFNULL(SUM(prodNum),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`) ) prodNum,
                         (SELECT  CONVERT(IFNULL(SUM(prodValue),0),DECIMAL(12,2)) FROM gd_instorage_count gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode AND prp.`proCode`=gic.prodcode AND gic.`prodCode` IN(SELECT prodcode FROM `gd_rescategory_prod`)  ) prodValue
                 FROM `supplier_bank_info` sbi
-                         LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified
-                         LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
+                         LEFT JOIN  `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified  LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid
                 WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1
                 GROUP BY pr.supplierOnlyCode,prp.`proCode`  ORDER BY sbi.name,prp.`proCode`) t
 

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java

@@ -545,7 +545,7 @@ public class ProductInformationService extends MybatisBaseService<ProductInforma
 				}
 			}catch(Exception e){
 				e.printStackTrace();
-				System.err.println("i="+i+",value=null");
+				System.err.println("i="+i+",rowNum="+rowNum);
 			}
 
 			//aaa+=1;

yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionMapper.java

@@ -32,7 +32,7 @@ public interface PurchaseRequisitionMapper extends BaseMapper<PurchaseRequisitio
     @Select("select * from purchase_requisition  ")
     List<PurchaseRequisition> selectAll();
     @Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " +
-            " (SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE  gic.colex=pr.supplierOnlyCode " +
+            " (SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE  gic.supplierCodeUnified=pr.supplierOnlyCode " +
             " and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," +
             " MAX(pr.`arrivalDate`) arrivalDate " +
             " FROM `supplier_bank_info` sbi  " +