Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/stock_in_api_controller.go

@@ -1098,8 +1098,9 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				good_id := int64(items["good_id"].(float64))
 
+				good_id := int64(items["good_id"].(float64))
+				fmt.Println("stockout223232324343445456465656565565665", good_id)
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1167,16 +1168,17 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		fmt.Println(parseDateErr)
 	}
 
-	//errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
-	//info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	//if errs != nil {
-	//	utils.ErrorLog(errs.Error())
-	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
-	//	return
-	//}
+	errs := service.CreateWarehousingOutInfo(warehousingOutInfo)
+	info, _ := service.FindLastWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	if errs != nil {
+		utils.ErrorLog(errs.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		return
+	}
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"msg":                   "出库成功",
+		"info":                  info,
 		"warehousing_out_order": warehousing_out_order,
 	})