2022年10月10日17:40:30

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -24,6 +24,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.mocha.entity.PriceBank;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
@@ -157,10 +158,10 @@ public class GoodsDesc implements Serializable {
 	private String goodsTypeId;
 
 	@TableField(exist = false)
-	private List<GoodsPrice>  saleGoodsPrice;
+	private List<GoodsPrice> saleGoodsPrice;
 
 	@TableField(exist = false)
-	private List<GoodsPrice>  buyGoodsPrice;
+	private List<GoodsPrice> buyGoodsPrice;
 
 	@TableField(exist = false)
 	private List<GoodsFiles> filesList;
@@ -172,27 +173,27 @@ public class GoodsDesc implements Serializable {
 
 	/**
 	 * 规格尺寸1
-	 * */
+	 */
 	private String specsOne;
 
 	/**
 	 * 规格尺寸2
-	 * */
+	 */
 	private String specsTwo;
 
 	/**
 	 * 级别
-	 * */
+	 */
 	private String level;
 
 	/**
 	 * 产地
-	 * */
+	 */
 	private String placeProduction;
 
 	/**
 	 * 三包
-	 * */
+	 */
 	private String threeGuarantees;
 
 	private String levelOne;
@@ -230,7 +231,7 @@ public class GoodsDesc implements Serializable {
 	private BigDecimal integral;
 
 	@TableField(exist = false)
-    private String goodsTypeName;
+	private String goodsTypeName;
 	/**
 	 * 尺寸
 	 */
@@ -284,5 +285,13 @@ public class GoodsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "规格型号")
 	private String specificationAndModel;
+	/**
+	 * 出口价格库id集合(配件)
+	 */
+	@ApiModelProperty(value = "出口价格库id集合")
+	private String partsIds;
+
+	@TableField(exist = false)
+	private List<PriceBank> priceBankList;
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsSpecification.java

@@ -121,5 +121,23 @@ public class GoodsSpecification implements Serializable {
 		@ApiModelProperty(value = "是否已删除（0 否 1是）")
 		private Integer isDeleted;
 
+	/**
+	 * 属性编号
+	 */
+	@ApiModelProperty(value = "属性编号")
+	private String attributeNo;
+
+	/**
+	 * 属性名称
+	 */
+	@ApiModelProperty(value = "属性名称")
+	private String attributeName;
+
+	/**
+	 * 属性值
+	 */
+	@ApiModelProperty(value = "属性值")
+	private String attributeData;
+
 
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/feign/IPriceBankClient.java

@@ -2,12 +2,14 @@ package org.springblade.mocha.feign;
 
 import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
+import org.springblade.mocha.entity.PriceBank;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 出口价格库对外访问接口
@@ -18,6 +20,7 @@ import java.util.Date;
 public interface IPriceBankClient {
 	String API_PREFIX = "/client";
 	String UPDATE_PRICE = API_PREFIX + "/updatePrice";
+	String SELECT_BY_ID = API_PREFIX + "/selectById";
 
 	/**
 	 * 更新出口价格库价格
@@ -58,4 +61,12 @@ public interface IPriceBankClient {
 					  @RequestParam(value = "referrerReason",required = false) String referrerReason,
 					@RequestParam(value = "remarks",required = false) String remarks);
 
+	/**
+	 * 通过ids查看数据
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping(SELECT_BY_ID)
+	List<PriceBank> selectById(@RequestParam("ids") String ids);
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -851,4 +851,10 @@ public class Order extends OrderBase {
 	@TableField(exist = false)
 	private String statuss;
 
+	/**
+	 * 盘点查询状态
+	 */
+	@TableField(exist = false)
+	private String pdStatus;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -46,6 +46,8 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.mocha.entity.PriceBank;
+import org.springblade.mocha.feign.IPriceBankClient;
 import org.springblade.mocha.feign.ISalesPolicyClient;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.feign.IOrderItemsClient;
@@ -97,6 +99,9 @@ public class GoodsDescController extends BladeController {
 
 	private final GoodsFilesMapper goodsFilesMapper;
 
+
+	private final IPriceBankClient priceBankClient;
+
 	/**
 	 * 详情
 	 */
@@ -231,6 +236,9 @@ public class GoodsDescController extends BladeController {
 			.eq(GoodsSpecification::getTenantId, SecureUtil.getTenantId())
 		);
 		goodsDesc.setGoodsSpecificationList(goodsSpecificationList);
+
+		goodsDesc.setPriceBankList(priceBankClient.selectById(goodsDesc.getPartsIds()));
+
 		return R.data(goodsDesc);
 	}
 
@@ -371,6 +379,7 @@ public class GoodsDescController extends BladeController {
 						e.setCorpCode(desc.getCode());
 					}
 				}
+				e.setPriceBankList(priceBankClient.selectById(e.getPartsIds()));
 			});
 
 		}
@@ -485,6 +494,7 @@ public class GoodsDescController extends BladeController {
 
 	/**
 	 * 获得所有商品类别
+	 *
 	 * @return typeList
 	 */
 	@GetMapping("/goodsTypeList")
@@ -498,13 +508,14 @@ public class GoodsDescController extends BladeController {
 
 	/**
 	 * 根据类别id获得属于该类别的所有商品数据
+	 *
 	 * @param current
 	 * @param size
-	 * @param goodsTypeId 	类型id
-	 * @param cname   		商品名称
-	 * @param typeno		规格编码
-	 * @param brandItem		花纹
-	 * @param brand			品牌
+	 * @param goodsTypeId 类型id
+	 * @param cname       商品名称
+	 * @param typeno      规格编码
+	 * @param brandItem   花纹
+	 * @param brand       品牌
 	 * @return list
 	 */
 	@GetMapping("/getGoodsList")

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/feign/PriceBankClient.java

@@ -7,12 +7,12 @@ import org.springblade.client.entity.GoodsType;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
 import org.springblade.client.vo.GoodsDescVO;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.mocha.entity.PriceBank;
 import org.springblade.mocha.mapper.PriceBankMapper;
-import org.springblade.mocha.service.IPriceBankService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -20,45 +20,45 @@ import springfox.documentation.annotations.ApiIgnore;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Logger;
+import java.util.List;
 
 @NonDS
 @ApiIgnore()
 @RestController
 @AllArgsConstructor
-public class PriceBankClient implements IPriceBankClient{
+public class PriceBankClient implements IPriceBankClient {
 
 	private final PriceBankMapper priceBankMapper;
 	private final IGoodsDescClient goodsDescClient;
 	private final ICorpsDescClient corpsDescClient;
+
 	/**
-	 *
-	 * @param itemId 商品id
-	 * @param price  价格
-	 * @param tenantId 租户id
-	 * @param corpId 供应商
-	 * @param specs 商品规格
-	 * @param billType 价格类型 XS 销售价格 CG 采购价格
-	 * @param tradeType 贸易类型 GN 国内 JK 进口 CK 出口
-	 * @param exchangeRate 汇率
-	 * @param greenback 美元价格
-	 * @param currency 币别
-	 * @param coefficient FOB系数
-	 * @param taxRate 税率
-	 * @param dateTime 有效期结束
-	 * @param purchaseAmount 采购金额
+	 * @param itemId           商品id
+	 * @param price            价格
+	 * @param tenantId         租户id
+	 * @param corpId           供应商
+	 * @param specs            商品规格
+	 * @param billType         价格类型 XS 销售价格 CG 采购价格
+	 * @param tradeType        贸易类型 GN 国内 JK 进口 CK 出口
+	 * @param exchangeRate     汇率
+	 * @param greenback        美元价格
+	 * @param currency         币别
+	 * @param coefficient      FOB系数
+	 * @param taxRate          税率
+	 * @param dateTime         有效期结束
+	 * @param purchaseAmount   采购金额
 	 * @param priorityReferrer 是否重点推荐
-	 * @param referrerReason  推荐理由
-	 * * @return
-	 * 	 * 1.先根据商品id,商品规格，价格类型，租户id，供应商，贸易类型 查未删除的价格库数据
-	 * 	 * 2.查到后先执行将历史价格依次更新操作 未查到暂不执行更新操作
-	 * 	 * 3.查到将价格赋值到最新价格字段上 最新价格日期为当前时间 未查到暂不执行更新操作
-	 * 	 * 4.修改价格库数据
+	 * @param referrerReason   推荐理由
+	 *                         * @return
+	 *                         * 1.先根据商品id,商品规格，价格类型，租户id，供应商，贸易类型 查未删除的价格库数据
+	 *                         * 2.查到后先执行将历史价格依次更新操作 未查到暂不执行更新操作
+	 *                         * 3.查到将价格赋值到最新价格字段上 最新价格日期为当前时间 未查到暂不执行更新操作
+	 *                         * 4.修改价格库数据
 	 * @return
 	 */
 	@GetMapping(UPDATE_PRICE)
 	@Override
-	public int updatePrice(Long itemId, BigDecimal price, String tenantId, Long corpId,String specs, String billType, String tradeType,BigDecimal exchangeRate,
+	public int updatePrice(Long itemId, BigDecimal price, String tenantId, Long corpId, String specs, String billType, String tradeType, BigDecimal exchangeRate,
 						   BigDecimal greenback,
 						   String currency,
 						   BigDecimal coefficient,
@@ -73,23 +73,23 @@ public class PriceBankClient implements IPriceBankClient{
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		try {
 			date = sdf.parse(dateTime);
-		}catch (Exception e){
+		} catch (Exception e) {
 			System.out.println("转换日期出错");
 		}
 		int flag = 0;
 		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(PriceBank::getBillType,billType);
-		lambdaQueryWrapper.eq(PriceBank::getTradeType,tradeType);
-		lambdaQueryWrapper.eq(PriceBank::getTenantId,tenantId);
-		lambdaQueryWrapper.eq(PriceBank::getItemId,itemId);
-		lambdaQueryWrapper.eq(PriceBank::getCorpId,corpId);
+		lambdaQueryWrapper.eq(PriceBank::getBillType, billType);
+		lambdaQueryWrapper.eq(PriceBank::getTradeType, tradeType);
+		lambdaQueryWrapper.eq(PriceBank::getTenantId, tenantId);
+		lambdaQueryWrapper.eq(PriceBank::getItemId, itemId);
+		lambdaQueryWrapper.eq(PriceBank::getCorpId, corpId);
 		PriceBank priceBank = priceBankMapper.selectOne(lambdaQueryWrapper);
 		//获取商品信息
 		R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(itemId);
 		R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(corpId);
 		PriceBank bank = new PriceBank();
 		bank.setItemId(itemId);
-		if (goodsDesc.isSuccess() && goodsDesc.getData() != null){
+		if (goodsDesc.isSuccess() && goodsDesc.getData() != null) {
 			bank.setCode(goodsDesc.getData().getCode());
 			bank.setCname(goodsDesc.getData().getCname());
 			bank.setEname(goodsDesc.getData().getEname());
@@ -111,26 +111,40 @@ public class PriceBankClient implements IPriceBankClient{
 		bank.setPurchaseAmount(purchaseAmount);
 		bank.setPriorityReferrer(priorityReferrer);
 		bank.setReferrerReason(referrerReason);
-		if (corpMessage.isSuccess() && corpMessage.getData() != null){
+		if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 			bank.setCorpName(corpMessage.getData().getCname());
 		}
 		GoodsType goodsType = goodsDescClient.goodTypeId(itemId);
-		if (goodsType != null){
+		if (goodsType != null) {
 			bank.setGoodsTypeName(goodsType.getCname());
 		}
-		if (priceBank != null){
-			if (new Date().compareTo(priceBank.getPriceTime()) >0){
+		if (priceBank != null) {
+			if (new Date().compareTo(priceBank.getPriceTime()) > 0) {
 				priceBankMapper.updatePrice(priceBank.getId());//更新历史价格
 			}
 			bank.setId(priceBank.getId());
 			bank.setUpdateUser(SecureUtil.getUserId());
 			bank.setUpdateTime(new Date());
 			flag = priceBankMapper.updateById(bank);
-		}else {
+		} else {
 			bank.setCreateUser(SecureUtil.getUserId());
 			bank.setCreateTime(new Date());
 			flag = priceBankMapper.insert(bank);
 		}
 		return flag;
 	}
+
+	/**
+	 * 通过ids查看数据
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@GetMapping(SELECT_BY_ID)
+	@Override
+	public List<PriceBank> selectById(String ids) {
+		LambdaQueryWrapper<PriceBank> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PriceBank::getIsDeleted, 0).eq(PriceBank::getTenantId, AuthUtil.getTenantId()).apply("find_in_set(id,'" + ids + "')");
+		return priceBankMapper.selectList(lambdaQueryWrapper);
+	}
 }

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

@@ -21,6 +21,7 @@ import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Desk启动器
@@ -32,6 +33,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  * 销售订单模块
  */
 @EnableBladeFeign
+@EnableFeignClients({"org.springblade", "com.trade.purchase"})
 @SpringCloudApplication
 @SeataCloudApplication
 public class PurchaseSalesApplication {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -65,7 +65,7 @@ public class ExportOrderController extends BladeController {
 	private final IOrderPartsService orderPartsService;
 	private final IFinanceClient financeClient;
 	private final IDeliveryClient deliveryClient;
-//	private final IFinancingClient financingClient;
+	private final IFinancingClient financingClient;
 
 	/**
 	 * 详情
@@ -626,9 +626,14 @@ public class ExportOrderController extends BladeController {
 			LambdaQueryWrapper<Order> CKlambdaQueryWrapper = new LambdaQueryWrapper<>();
 			CKlambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
 				.eq(Order::getIsDeleted, 0)
-				.eq(Order::getStatus, 3)
 				.eq(Order::getBillType, OrderTypeEnum.OUT_WAREHOUSING.getType())
-				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());
+				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType())
+				.eq(Order::getStatus, 3);
+			CKlambdaQueryWrapper.or()
+				.eq(Order::getIsDeleted, 0)
+				.eq(Order::getBillType, OrderTypeEnum.OUT_WAREHOUSING.getType())
+				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType())
+				.eq(Order::getStatus, 6);
 			//盘点待审核
 			LambdaQueryWrapper<Order> PDlambdaQueryWrapper = new LambdaQueryWrapper<>();
 			PDlambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId())
@@ -636,16 +641,11 @@ public class ExportOrderController extends BladeController {
 				.eq(Order::getStatus, 3)
 				.eq(Order::getBillType, OrderTypeEnum.INVENTORY.getType())
 				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());
-			//融资待审核
-			LambdaQueryWrapper<Financing> financingLambdaQueryWrapper = new LambdaQueryWrapper<>();
-			financingLambdaQueryWrapper.eq(Financing::getTenantId, AuthUtil.getTenantId())
-				.eq(Financing::getIsDeleted, 0)
-				.eq(Financing::getStatus, 3);
 
 			checkDate.setPurchaseNumber(orderService.count(RKlambdaQueryWrapper));
 			checkDate.setSellNumber(orderService.count(CKlambdaQueryWrapper));
 			checkDate.setOfferNumber(orderService.count(PDlambdaQueryWrapper));
-//			checkDate.setFinancingSum(financingClient.count());
+			checkDate.setFinancingSum(financingClient.count());
 		} else {
 			if (StringUtils.isBlank(order.getTradeType())) {
 				throw new SecurityException("缺少贸易类型");

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

@@ -1504,11 +1504,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				.eq(Order::getBillType, OrderTypeEnum.WAREHOUSING.getType())
 				.eq(Order::getTradeType, OrderTypeEnum.WOOD_HARVESTING_CLOUD.getType());
 			int unrecognized = baseMapper.selectCount(RKlambdaQueryWrapper);
-			monthSales.setGrossAmount(BigDecimal.valueOf((int) sum));
-			monthSales.setSoldQuantity(BigDecimal.valueOf((int) (sum-unrecognized)));
-			monthSales.setReachAmount(BigDecimal.valueOf((int) (sum-unrecognized)));
-			monthSales.setUnsoldQuantity(BigDecimal.valueOf((int) unrecognized));
-			monthSales.setNotReachAmount(BigDecimal.valueOf((int) unrecognized));
+			monthSales.setGrossAmount(BigDecimal.valueOf((int) (sum-unrecognized)));
+			monthSales.setNotReachAmount(BigDecimal.valueOf((int) sum));
+			monthSales.setReachAmount(BigDecimal.valueOf((int) unrecognized));
 			if (monthSales.getGrossAmount().compareTo(BigDecimal.ZERO) > 0) {//达成金额%总金额*100（保留两位并四舍五入）
 				monthSales.setYieldRate(monthSales.getReachAmount().divide(monthSales.getGrossAmount(), 5, RoundingMode.HALF_UP).multiply(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP));
 			} else {

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

@@ -1308,14 +1308,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					orderItems.setCreateUserName(AuthUtil.getUserName());
 					orderItemsMapper.insert(orderItems);
 				}
-				if (ObjectUtils.isNotNull(orderItems.getBalanceNumber())){
+				if (ObjectUtils.isNotNull(orderItems.getBalanceNumber())) {
 					balanceNumber = balanceNumber.add(orderItems.getBalanceNumber());
-				}else{
+				} else {
 					balanceNumber = balanceNumber.add(new BigDecimal(0));
 				}
-				if(ObjectUtils.isNotNull(orderItems.getBalanceMoney())){
+				if (ObjectUtils.isNotNull(orderItems.getBalanceMoney())) {
 					balanceMoney = balanceMoney.add(orderItems.getBalanceMoney());
-				}else{
+				} else {
 					balanceNumber = balanceNumber.add(new BigDecimal(0));
 				}
 
@@ -1744,15 +1744,19 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq(OrderFees::getIsDeleted, 0)
 			.eq(OrderFees::getPid, order.getId())
 			.eq(OrderFees::getIsCheck, 1)
-			.ne(OrderFees::getSettlmentAmount, 0)
+			.eq(OrderFees::getSettlmentAmount, 0)
 			.eq(OrderFees::getSubmitPay, 1);
 		List<OrderFees> orderFeesList = orderFeesService.list(lambdaQueryWrapper);
 		for (OrderFees orderFees : orderFeesList) {
-			orderFees.setIsCheck(0);
-			orderFees.setSubmitPay(0);
-			orderFees.setSettlmentAmount(new BigDecimal("0"));
-			financeClient.deleteBySrcFeesId(orderFees.getId());
-			orderFeesService.updateById(orderFees);
+			if ("1".equals(orderFees.getStorageFee())) {
+				orderFeesService.removeById(orderFees.getId());
+			} else {
+				orderFees.setIsCheck(0);
+				orderFees.setSubmitPay(0);
+				orderFees.setSettlmentAmount(new BigDecimal("0"));
+				financeClient.deleteBySrcFeesId(orderFees.getId());
+				orderFeesService.updateById(orderFees);
+			}
 		}
 		baseMapper.updateById(order);
 		return R.success("操作成功");
@@ -2151,7 +2155,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtils.isNotNull(order.getSpecialCheckStatusApp())) {
 			queryWrapper.eq("special_check_status", 0);
 		} else {
-			if (OrderTypeEnum.INVENTORY.getType().equals(order.getBillType())) {
+			if (OrderTypeEnum.INVENTORY.getType().equals(order.getPdStatus())) {
 				queryWrapper.eq("special_check_status", 0);
 			}
 		}
@@ -2251,11 +2255,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		List<Order> orderList = baseMapper.selectList(orderLambdaQueryWrapper);
 		BigDecimal storageAmount = orderList.stream().map(Order::getStorageAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 		int num = financing.signum();
-		if (num == -1) {
 			if (storageAmount.compareTo(financing.abs()) < 0) {
 				return R.data("融资金额:" + financing + "大于 库存金额 :" + storageAmount + " 是否继续操作？");
 			}
-		}
 		return R.data("操作成功");
 	}
 
@@ -2320,6 +2322,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				if (goodsMessage.isSuccess() && goodsMessage.getData() != null) {
 					orderItems.setCname(goodsMessage.getData().getCname());
 				}
+				orderItems.setForklift(null);
+				orderItems.setCarry(null);
 				return R.data(orderItems);
 			}
 		}