凯和扣货调整

ruoyi-warehouse/src/main/java/com/ruoyi/finance/service/impl/TFeeServiceImpl.java

@@ -1216,7 +1216,7 @@ public class TFeeServiceImpl implements ITFeeService {
                 //如果订舱单位是凯和 应收尾0 也是放货状态
                 //1:  未放货   应收>0  应收>实收
                 //2：放货      应收>0  应收=实收
-                if (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) == 0 ){
+                if ((tCorps == null || tCorps.getfCname().equals("青岛凯和志诚物流有限公司")) && !warehouseBills.getfCaregoStatus().equals("3") ){
                     tWarehouseBills.setfCaregoStatus("2");
                 }else if (warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) > 0){
                     tWarehouseBills.setfCaregoStatus("1");

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1139,7 +1139,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         List<TWarehousebillsfees> fc = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBills.getfId(), "C");
         warehouseBills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
         warehouseBills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
-        if (tCorps.getfCname().equals("青岛凯和志诚物流有限公司")){
+        if (tCorps == null || tCorps.getfCname().equals("青岛凯和志诚物流有限公司")){
             warehouseBills.setfCaregoStatus("2");
         }else if (CollectionUtils.isNotEmpty(fd) && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0){
             warehouseBills.setfCaregoStatus("1");
@@ -2973,7 +2973,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehouseBills warehousebills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
         warehousebills.setfReceivable(fd.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
         warehousebills.setfDue(fc.stream().filter(ei->ei.getfAmount()!=null).map(TWarehousebillsfees::getfAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
-        if (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3")){
+        if (tCorps == null || (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehousebills.getfCaregoStatus().equals("3"))){
             warehousebills.setfCaregoStatus("2");
         }else if (!warehousebills.getfCaregoStatus().equals("3") && warehousebills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehousebills.getfReceivable().compareTo(warehousebills.getfRecycle()) > 0){
             warehousebills.setfCaregoStatus("1");
@@ -8256,9 +8256,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TCorps tCorps = tCorpsMapper.selectTCorpsById(warehouseBills.getfCorpid());
                 if (tWarehouseBills.getfCaregoStatus().equals("2") && warehouseBills.getfCaregoStatus().equals("3")){
                    tWarehouseBillsMapper.updateTWarehousebills(bills);
-                }else if (tWarehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfCaregoStatus().equals("2") && !tCorps.getfCname().equals("青岛凯和志诚物流有限公司")){
-                    tWarehouseBillsMapper.updateTWarehousebills(bills);
-                }else if (tWarehouseBills.getfCaregoStatus().equals("3") && tCorps.getfCname().equals("青岛凯和志诚物流有限公司")){
+                }else if (tWarehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfCaregoStatus().equals("2")){
                     tWarehouseBillsMapper.updateTWarehousebills(bills);
                 }else {
                     stringList.add(warehouseBills.getfMblno());
@@ -8295,7 +8293,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 //如果订舱单位是凯和 应收尾0 也是放货状态
                 //1:  未放货   应收>0  应收>实收
                 //2：放货      应收>0  应收=实收
-                if (tCorps.getfCname().equals("青岛凯和志诚物流有限公司") && !warehouseBills.getfCaregoStatus().equals("3") ){
+                if ((tCorps == null || tCorps.getfCname().equals("青岛凯和志诚物流有限公司")) && !warehouseBills.getfCaregoStatus().equals("3") ){
                     tWarehouseBills.setfCaregoStatus("2");
                 }else if (!warehouseBills.getfCaregoStatus().equals("3") && warehouseBills.getfReceivable().compareTo(BigDecimal.ZERO) > 0 && warehouseBills.getfReceivable().compareTo(tWarehouseBills.getfRecycle()) > 0){
                     tWarehouseBills.setfCaregoStatus("1");