Merge branch 'ww' into orderChange

api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java

@@ -255,6 +255,7 @@ public class OrderDetailController {
 
         //第三方单据
         BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.finByThirdAction(thrOrderEntity.getBillType());
+      if(bussinessOriginTypeResponse!=null){
         stockOrderEntity.setBillType(bussinessOriginTypeResponse.getLocalAction());
         stockOrderEntity.setId(null);
         stockOrderEntity.setStatus(ConstantStatus.SORDER_ALLOC);//未提交
@@ -264,6 +265,7 @@ public class OrderDetailController {
         stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
         stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
         stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
+      }
         boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
         stockOrderEntity = stockOrderService.findByBillNo(billNo);
         FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();