核销红单逻辑优化

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursement.java

@@ -475,7 +475,7 @@ public class tpartreimbursement extends Controller {
         querySQL.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t2", "t2.st_stockbillid = t1.st_stockbillid AND t2.siteid = t1.siteid","amount");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
-        querySQL.setWhere("t1.sourceobject='tpartreimbursement' and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
+        querySQL.setWhere("t1.departmentid=(select departmentid from sys_department where depname='售后部') and t1.rb=0 and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
         Rows rows = querySQL.query();
 
         HashMap<String,BigDecimal> map =new HashMap<>();
@@ -518,7 +518,7 @@ public class tpartreimbursement extends Controller {
         querySQL1.addJoinTable(JOINTYPE.left, "st_stockbill_items", "t2", "t2.st_stockbillid = t1.st_stockbillid AND t2.siteid = t1.siteid","amount");
         querySQL1.setSiteid(siteid);
         querySQL1.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
-        querySQL1.setWhere("t1.sourceobject='tpartreimbursement' and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
+        querySQL1.setWhere("t1.departmentid=(select departmentid from sys_department where depname='售后部') and t1.rb=0 and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
         Rows rows1 = querySQL1.query();
 
         HashMap<String,BigDecimal> map =new HashMap<>();

src/custom/restcontroller/webmanage/sale/tpartreimbursement/tpartreimbursementdetail.java

@@ -57,7 +57,7 @@ public class tpartreimbursementdetail extends Controller {
         querySQL_yhx.setTableAlias("t1");
         querySQL_yhx.setSiteid(siteid);
         querySQL_yhx.setWhere("t1.sys_enterpriseid", rows.toArrayList("sys_enterpriseid"));
-        querySQL_yhx.setWhere("t1.sourceobject='tpartreimbursement' and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
+        querySQL_yhx.setWhere("t1.departmentid=(select departmentid from sys_department where depname='售后部') and t1.rb=0 and t1.status='审核' and t1.type='销售出库' and DATE_FORMAT(t1.checkdate, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )");
         Rows rows_yhx = querySQL_yhx .query();
         RowsMap rowsMap_yhx=rows_yhx.toRowsMap("sys_enterpriseid");