Przeglądaj źródła

处理分批发货的关联不到物料的问题。

yujia 7 lat temu
rodzic
commit
d28b140469

+ 1 - 1
src/main/java/com/uas/platform/b2c/logistics/service/impl/InvoiceFPurchaseServiceImpl.java

@@ -322,7 +322,7 @@ public class InvoiceFPurchaseServiceImpl implements InvoiceFPurchaseService {
 			ensurePrice = NumberUtil.add(ensurePrice, price);
 			taxes = NumberUtil.add(taxes, NumberUtil.sub(NumberUtil.mul(qty, puDetail.getTaxUnitPrice()), NumberUtil.mul(qty, puDetail.getUnitprice())));
 		}
-		if (CollectionUtils.isNotEmpty(IpDetails)) {
+		if (CollectionUtils.isEmpty(IpDetails)) {
 			throw new IllegalOperatorException("没有需要发货的信息");
 		}
 		Enterprise enterprise = enterpriseDao.findByUu(purchase.getSellerenuu());

+ 1 - 0
src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderDetailServiceImpl.java

@@ -203,6 +203,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
 		orderDetail.setProductId(goods.getProductid());
 		String detailid = EncodingRulesConstant.ORDER_DETAIL.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$order_detail", 9));
 		orderDetail.setDetailid(detailid);
+		orderDetail.setGoodsnumber(goods.getProdNum());
 		return orderDetail;
 	}
 

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -875,7 +875,7 @@
             </div>
           </dd>
           <dd class="pay_price">
-            <div ng-if="checkinvoice.status==406">
+            <div ng-if="checkinvoice.status==406 || checkinvoice.status==502">
               <a href="javascript:void(0)" ng-click="saveCheck()" class="confirm">确认发货</a>
               <a ng-click="backToDelivery()" class="cancel">取消</a>
               <!--<a ng-click="addDistributor()" class="add">新增配送商</a>-->