Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo

src/main/java/com/glxp/api/service/inout/IoAddInoutService.java

@@ -300,7 +300,7 @@ public class IoAddInoutService {
         }
 
         if (StrUtil.isNotEmpty(errMsg)) {
-            return updateErrMsg(orderEntity, "未选择当前仓库信息");
+            return updateErrMsg(orderEntity, errMsg);
         }
         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
         orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java

@@ -391,6 +391,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
             ioOrderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);//草稿
             ioOrderEntity.setCorpOrderId(billNo);//单据号
             ioOrderEntity.setUpdateTime(new Date());
+            ioOrderEntity.setCustomerId("110");
             ioOrderEntity.setCreateTime(new Date());
             Long userId = customerService.getUserId();
             ioOrderEntity.setCreateUser(userId + "");
@@ -962,8 +963,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
                             BeanUtils.copyProperties(item, thrInvOrderDetail);
                             thrInvOrderDetail.setOrderIdFk(billNo);
                             thrInvOrderDetail.setRelId(sk.getRelId());
-
-
+                            thrInvOrderDetail.setSupId(sk.getSupId() + "");
                             Integer skCount = sk.getCount();
                             if (skCount != null && skCount > 0) {
                                 thrInvOrderDetail.setReCount(String.valueOf(skCount * finalCount));