2022年11月7日16:11:07

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescPartsController.java

@@ -127,6 +127,7 @@ public class CorpsDescPartsController extends BladeController {
 			} else {
 				order.setBillType("XS");
 			}
+			order.setTradeType("YPJ");
 			order.setStartTime(corpsDescDto.getStartTime());
 			order.setEndTime(corpsDescDto.getEndTime());
 			List<Order> orderList = orderDescClient.getByBillNo(order);
@@ -217,7 +218,7 @@ public class CorpsDescPartsController extends BladeController {
 			Order order = new Order();
 			order.setCorpId(corpsDesc.getId());
 			order.setBillType("XS");
-			order.setTradeType("JXS");
+			order.setTradeType("YPJ");
 			order.setCorpType("1");
 			int count = orderDescClient.corpAnalysis(order);
 			if (count == 0 ){
@@ -234,7 +235,7 @@ public class CorpsDescPartsController extends BladeController {
 		}
 		Order order = new Order();
 		order.setBillType("XS");
-		order.setTradeType("JXS");
+		order.setTradeType("YPJ");
 		List<Order> orderList = orderDescClient.getByBillNo(order);
 		if (ObjectUtils.isNotNull(orderList)) {
 			//应收账款

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -393,7 +393,9 @@
         short_name AS shortName,
         tel AS tel,
         status AS status,
-        corp_type AS corpType
+        corp_type AS corpType,
+        credit_grant AS creditGrant,
+        arrears AS arrears
         from
         basic_corps_desc
         where
@@ -443,7 +445,9 @@
         short_name AS shortName,
         tel AS tel,
         status AS status,
-        corp_type AS corpType
+        corp_type AS corpType,
+        credit_grant AS creditGrant,
+        arrears AS arrears
         from
         basic_corps_desc
         where

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsDescServiceImpl.java

@@ -738,7 +738,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, CorpsDesc
 			Order order = new Order();
 			order.setCorpId(corpsDesc.getId());
 			order.setBillType("XS");
-			order.setTradeType("JXS");
+			order.setTradeType("YPJ");
 			List<Order> orderList = orderDescClient.getByBillNo(order);
 			if (ObjectUtils.isNotNull(orderList)) {
 				//未收账款

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1823,6 +1823,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<OrderItems> orderItemsList = order.getOrderItemsList();
 		//获取费用主表信息
 		List<OrderCost> orderCostList = orderCostMapper.selectList(lambdaQueryWrapper);
+		//国内费用追加海运费
+		if(order.getDomesticAbroad().equals("1")){
+			//获取费用主表信息
+			LambdaQueryWrapper<OrderCost> lambdaQueryWrappers = new LambdaQueryWrapper<>();
+			lambdaQueryWrappers.eq(OrderCost::getGoodsAttribute, order.getCargoType())
+				.eq(OrderCost::getOutHarborName, order.getPortOfLoad());
+			lambdaQueryWrappers.eq(OrderCost::getObjectiveName, order.getPortOfDestination());
+			lambdaQueryWrappers.eq(OrderCost::getStatus, 0)
+				.eq(OrderCost::getTenantId, AuthUtil.getTenantId())
+				.eq(OrderCost::getIsDeleted, 0);
+			//获取费用主表信息
+			List<OrderCost> orderCostLists = orderCostMapper.selectList(lambdaQueryWrapper);
+			orderCostList.addAll(orderCostLists);
+		}
 		for (OrderCost orderCost : orderCostList) {
 			//获取费用明细
 			LambdaQueryWrapper<OrderCostItem> itemLambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -1325,12 +1325,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setBalanceNumber(orderItems.getStorageInQuantity());//结余量
 					orderItems.setBalanceMoney(orderItems.getStorageAmount());//结余金额
 				} else if (OrderTypeEnum.OUT_WAREHOUSING.getType().equals(submitDto.getBillType())) {//出库  同时更新入库明细货物状态
-					orderItems.setIsIssue("4");
 					orderItems.setBillType(OrderTypeEnum.OUT_WAREHOUSING.getType());
-					OrderItems items = new OrderItems();
-					items.setId(orderItems.getSrcItemId());
-					items.setIsIssue("4");
-					orderItemsMapper.updateById(items);
 				} else if (OrderTypeEnum.INVENTORY.getType().equals(submitDto.getBillType())) {
 					orderItems.setBillType(OrderTypeEnum.INVENTORY.getType());
 				}
@@ -1341,6 +1336,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setUpdateUserName(AuthUtil.getUserName());
 					orderItemsMapper.updateById(orderItems);
 				} else {
+					orderItems.setIsIssue("4");
+
+					OrderItems items = new OrderItems();
+					items.setId(orderItems.getSrcItemId());
+					items.setIsIssue("4");
+					orderItemsMapper.updateById(items);
 					orderItems.setCreateTime(new Date());
 					orderItems.setCreateUser(AuthUtil.getUserId());
 					orderItems.setCreateUserName(AuthUtil.getUserName());
@@ -1629,6 +1630,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (0 == times) {//第一次审批
 					RKOrderItems.setIsIssue("5");
 					orderItems.setIsIssue("5");
+				}else {//第二次审批
+					RKOrderItems.setIsIssue("7");
+					orderItems.setIsIssue("7");
 				}
 				//修改入库明细
 				orderItemsMapper.updateById(RKOrderItems);