处理买家确认收货没有物料的问题

src/main/java/com/uas/platform/b2c/logistics/model/InvoiceFOrderDetail.java

@@ -253,6 +253,7 @@ public class InvoiceFOrderDetail {
 		this.b2cMinDelivery = detail.getB2cMinDelivery();
 		this.b2cMaxDelivery = detail.getB2cMaxDelivery();
 		this.remark = detail.getRemark();
+		this.spec = detail.getSpec();
 	}
 
 	/**

src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFOrderServiceImpl.java

@@ -19,8 +19,10 @@ import com.uas.platform.b2c.logistics.service.InvoiceFOrderDetailService;
 import com.uas.platform.b2c.logistics.service.InvoiceFOrderService;
 import com.uas.platform.b2c.logistics.service.LogisticsPortService;
 import com.uas.platform.b2c.prod.commodity.constant.DoubleConstant;
+import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.InOutboundDetail;
 import com.uas.platform.b2c.prod.commodity.service.CommodityInOutboundService;
+import com.uas.platform.b2c.prod.commodity.service.GoodsService;
 import com.uas.platform.b2c.prod.commodity.service.InOutboundDetailService;
 import com.uas.platform.b2c.prod.commodity.type.InOutBoundType;
 import com.uas.platform.b2c.prod.product.common.service.CreateNumberService;
@@ -94,6 +96,9 @@ public class InvoiceFOrderServiceImpl implements InvoiceFOrderService {
 	@Autowired
 	private CommodityInOutboundService commodityInOutboundService;
 
+	@Autowired
+	private GoodsService goodsService;
+
 	@Override
 	public InvoiceFOrder save(InvoiceFOrder inFor) {
 		Set<InvoiceFOrderDetail> inForDs = inFor.getInvoiceFOrderDetails();
@@ -482,6 +487,8 @@ public class InvoiceFOrderServiceImpl implements InvoiceFOrderService {
 			String detailId = EncodingRulesConstant.INVOICE_DETAIL_FROMORDER.replace("_TIMESTAP_NUMBER",
 					createNumberService.getTimeNumber("trade$invoice_fmor_dt", 9));
 			InvoiceFOrderDetail invoiceDetail = new InvoiceFOrderDetail(orDetail, detailId, qty);
+			Goods goodsByBatchCode = goodsService.findGoodsByBatchCode(orDetail.getBatchCode());
+			invoiceDetail.setProductid(goodsByBatchCode.getProductid());
 			invoiceDetail.setDetno(detno++);
 			taxes = DoubleArith.add(taxes, invoiceDetail.getTaxes());
 			prices = DoubleArith.add(prices, invoiceDetail.getPrice());

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -241,7 +241,7 @@ public class OrderController {
 	/**
 	 * 客户签收发货
 	 * @param id 客户订单主键
-	 * @param invoiceId 对应的发货单 如果发货单信息存在，则只对
+	 * @param invoiceId 对应的发货单 如果发货单信息存在，则只对这个发货确认收货
 	 * @return
 	 */
 	@RequestMapping(value = "/signReceive", method = RequestMethod.PUT, params = "_status=ensureaccept")