no message

.gitignore

@@ -1,2 +1,5 @@
 .DS_Store
-*/.DS_Store
+*/.DS_Store
+go.mod
+go.sum
+XT_New

controllers/stock_in_v3_api_controller.go

@@ -0,0 +1,722 @@
+package controllers
+
+import (
+	"encoding/json"
+	"strconv"
+	"time"
+
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+
+	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
+)
+
+type StockManagerV3ApiController struct {
+	BaseAuthAPIController
+}
+
+func StockManagerV3ApiRegistRouters() {
+	// 耗材入库管理
+	// 创建入库单
+	beego.Router("/v3/api/warehouse/create", &StockManagerV3ApiController{}, "post:CreateWarehouse")
+	// 修改入库单
+	beego.Router("/v3/api/warehouse/edit", &StockManagerV3ApiController{}, "post:EditWarehouse")
+
+	// 库存查询
+	// 库存明细
+	beego.Router("/v3/api/stock/detail", &StockManagerApiController{}, "get:GetWarehouseDetailList")
+
+	// beego.Router("/api/warehouse/list", &StockManagerApiController{}, "get:GetWarehouseList")
+	// beego.Router("/api/warehouse/delete", &StockManagerApiController{}, "post:DeleteWarehouse")
+	// beego.Router("/api/warehouseinfo/delete", &StockManagerApiController{}, "post:DeleteWarehouseInfo")
+	// beego.Router("/api/warehouseinfo/list", &StockManagerApiController{}, "get:GetWarehouseInfoList")
+
+	// //退货管理和其他退货管理相关接口
+	// beego.Router("/api/salesreturn/create", &StockManagerApiController{}, "post:CreateSalesReturn")
+	// beego.Router("/api/salesreturn/delete", &StockManagerApiController{}, "post:DeleteSalesReturn")
+	// beego.Router("/api/salesreturninfo/delete", &StockManagerApiController{}, "post:DeleteSalesReturnInfo")
+	// beego.Router("/api/salesreturninfo/list", &StockManagerApiController{}, "get:GetSalesReturnInfoList")
+	// beego.Router("/api/salesreturn/list", &StockManagerApiController{}, "get:GetSalesReturnList")
+	// beego.Router("/api/salesreturn/edit", &StockManagerApiController{}, "post:EditReturnInfo")
+
+	// //出库管理和其他出库管理相关接口
+	// beego.Router("/api/warehouseout/create", &StockManagerApiController{}, "post:CreateWarehouseOut")
+	// beego.Router("/api/warehouseout/delete", &StockManagerApiController{}, "post:DeleteWarehouseOut")
+	// beego.Router("/api/warehouseoutinfo/delete", &StockManagerApiController{}, "post:DeleteWarehouseOutInfo")
+	// beego.Router("/api/warehouseout/list", &StockManagerApiController{}, "get:GetWarehouseOutList")
+	// beego.Router("/api/warehouseout/edit", &StockManagerApiController{}, "post:EditWarehouseOut")
+	// beego.Router("/api/warehouseout/info", &StockManagerApiController{}, "get:GetWarehouseOutInfoList")
+
+	// //出库退库管理和其他出库退库管理相关接口
+	// beego.Router("/api/cancelstock/create", &StockManagerApiController{}, "post:CreateCancelStock")
+	// beego.Router("/api/cancelstock/list", &StockManagerApiController{}, "get:GetCancelStockList")
+	// beego.Router("/api/cancelstock/info", &StockManagerApiController{}, "get:GetCancelStockInfoList")
+	// beego.Router("/api/cancelstock/delete", &StockManagerApiController{}, "post:DeleteCancelStock")
+	// beego.Router("/api/cancelstockinfo/delete", &StockManagerApiController{}, "post:DeleteCancelStockInfo")
+	// beego.Router("/api/cancelstockinfo/edit", &StockManagerApiController{}, "post:EditCancelStock")
+	// beego.Router("/api/cancelstockinfo/config", &StockManagerApiController{}, "get:GetCancelStockConfig")
+
+	// //库存相关全局配置
+	// beego.Router("/api/stock/config", &StockManagerApiController{}, "get:GetAllConfig")
+	// beego.Router("/api/return/config", &StockManagerApiController{}, "get:GetAllSalesReturnConfig")
+
+	// //库存查询
+	// beego.Router("/api/stock/query", &StockManagerApiController{}, "get:GetQueryInfo")
+
+	// beego.Router("/api/stock/detail", &StockManagerApiController{}, "get:GetDetailInfo")
+
+	// beego.Router("/api/warehouseout/user", &StockManagerApiController{}, "get:GetUserDetailInfo")
+
+	// beego.Router("/api/warehouseout/postsearchstock", &StockManagerApiController{}, "Get:PostSearchStock")
+
+	// beego.Router("/api/warehouseout/getoutstocktotalcount", &StockManagerApiController{}, "Get:GetOutStockTotalCount")
+
+	// beego.Router("/api/good/postgoodinformation", &StockManagerApiController{}, "Post:AddGoodInformation")
+
+	// beego.Router("/api/good/postdruginformation", &StockManagerApiController{}, "Post:AddDrugInformation")
+
+	// beego.Router("/api/good/initializtion", &StockManagerApiController{}, "Get:GetInitializtion")
+
+	// beego.Router("/api/good/getwarehouseorderinfolist", &StockManagerApiController{}, "Get:GetWarehouseOrderInfolist")
+
+	// beego.Router("/api/good/postsearchgoodlist", &StockManagerApiController{}, "Get:PostSearchGoodList")
+
+	// beego.Router("/api/good/getallstocklist", &StockManagerApiController{}, "Get:GetAllStockList")
+
+	// beego.Router("/api/stock/getstocklistbyid", &StockManagerApiController{}, "Get:GetStockListById")
+	// beego.Router("/api/stock/getstockoutlist", &StockManagerApiController{}, "Get:GetStockOutList")
+
+	// beego.Router("/api/good/getstockdrugcount", &StockManagerApiController{}, "Get:GetStockDrugCount")
+
+	// beego.Router("/api/good/getorderdetialbyorderid", &StockManagerApiController{}, "Get:GetOrderDetialByOrderId")
+	// beego.Router("/api/good/getorderdetaibyid", &StockManagerApiController{}, "Get:GetOrderDetailById")
+	// beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
+	// beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
+	// beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
+	// beego.Router("/api/stock/getsinglecancelorder", &StockManagerApiController{}, "Get:GetSingleCancelOrder")
+	// beego.Router("/api/stock/getcancelstockorderprint", &StockManagerApiController{}, "Get:GetCancelStockOrderPrint")
+	// beego.Router("/api/stock/getstockbatchnumber", &StockManagerApiController{}, "Get:GetStockBatchNumber")
+
+	// beego.Router("/api/stock/getstockflow", &StockManagerApiController{}, "Get:GetStockFlow")
+
+	// beego.Router("/api/cancel/getcancelexportlist", &StockManagerApiController{}, "Get:GetCancelExportList")
+
+	// //耗材调价
+	// beego.Router("/api/stock/postsearchgoodwarehouselist", &StockManagerApiController{}, "Get:GetSearchGoodWarehouseList")
+	// beego.Router("/api/stock/saveadjustprice", &StockManagerApiController{}, "Post:SaveAdjuestPrice")
+	// beego.Router("/api/stock/getallstockprice", &StockManagerApiController{}, "Get:GetAllStockPrice")
+	// beego.Router("/api/stock/savecheckedprice", &StockManagerApiController{}, "Get:SaveCheckPrice")
+	// beego.Router("/api/stock/getadjustpriceinfo", &StockManagerApiController{}, "Get:GetAdjustPriceById")
+	// beego.Router("/api/stock/savereportstock", &StockManagerApiController{}, "Post:SaveReportStock")
+	// beego.Router("/api/stock/getreportstocklist", &StockManagerApiController{}, "Get:GetReportStockList")
+	// beego.Router("/api/stock/savecheckdamage", &StockManagerApiController{}, "Get:SaveCheckDamage")
+	// beego.Router("/api/stock/saveinventory", &StockManagerApiController{}, "Post:SaveInventory")
+	// beego.Router("/api/stock/getinventorylist", &StockManagerApiController{}, "Get:GetInventorylist")
+	// beego.Router("/api/stock/savecheckinventory", &StockManagerApiController{}, "Get:SaveCheckInventory")
+	// beego.Router("/api/stock/getmodifypriceDetail", &StockManagerApiController{}, "Get:GetModifyPriceDetail")
+	// beego.Router("/api/stock/updatestockprice", &StockManagerApiController{}, "Get:UpdateStockPrice")
+	// beego.Router("/api/stock/deletestockprice", &StockManagerApiController{}, "Get:DeleteStockPrice")
+	// beego.Router("/api/stock/getstockdamagedetal", &StockManagerApiController{}, "Get:GetStockDamageDetail")
+	// beego.Router("/api/sotck/modifyprice", &StockManagerApiController{}, "Get:ModifyPrice")
+	// beego.Router("/api/stock/deletestockdamage", &StockManagerApiController{}, "Get:DeleteDamage")
+	// beego.Router("/api/stock/getstockdamagebyid", &StockManagerApiController{}, "Get:GetStockDamageById")
+	// beego.Router("api/sotck/getinventorydetail", &StockManagerApiController{}, "Get:GetInventoryDetail")
+	// beego.Router("/api/stock/modifyinventory", &StockManagerApiController{}, "Get:ModifyInventory")
+	// beego.Router("/api/stock/deleteinventory", &StockManagerApiController{}, "Get:DeleteInventory")
+	// beego.Router("/api/stock/getinventorydetaillist", &StockManagerApiController{}, "Get:GetInventoryDetailList")
+	// beego.Router("/api/stock/getinventoryprintlist", &StockManagerApiController{}, "Get:GetInventoryPrintList")
+	// beego.Router("/api/stock/getinventorydetailprintlist", &StockManagerApiController{}, "Get:GetInventoryDetailPrintList")
+	// beego.Router("/api/drug/deletedrugprice", &StockManagerApiController{}, "Get:DeleteDrugPrice")
+	// beego.Router("/api/stock/getgoodwarehouselist", &StockManagerApiController{}, "Get:GetGoodWarehouseList")
+	// beego.Router("/api/stock/proofinventory", &StockManagerApiController{}, "Get:ProofInventory")
+	// beego.Router("/api/stock/getwarehousetotal", &StockManagerApiController{}, "Get:GetWarehouseTotal")
+	// beego.Router("/api/stock/getgoodinventorywarehouselist", &StockManagerApiController{}, "Get:GetGoodInventoryWarehouseList")
+	// beego.Router("/api/stock/savestockinentorylist", &StockManagerApiController{}, "Post:SaveStockInventoryList")
+	// beego.Router("/api/sotck/getdamagedetailbygoodid", &StockManagerApiController{}, "Get:GetDamageDetailByGoodId")
+	// beego.Router("/api/stock/getinventoryexportlist", &StockManagerApiController{}, "Get:GetInventoryExportList")
+
+	// //处理历史数据
+	// beego.Router("/api/stock/updatecancelstockorder", &StockManagerApiController{}, "Get:UpdateCancelStockOrder")
+
+	// beego.Router("/api/stock/getdrugdetailsummary", &StockManagerApiController{}, "Get:GetDrugDetailSummary")
+	// beego.Router("/api/stock/getgooddetialsummary", &StockManagerApiController{}, "Get:GetGoodDetailSummary")
+
+	// //库存优化接口
+	// beego.Router("/api/stock/checkwarehouseout", &StockManagerApiController{}, "Get:CheckWarehouseOut")
+	// beego.Router("/api/stock/returncheckwarehouseout", &StockManagerApiController{}, "Get:ReturnCheckWarehouseOut")
+	// beego.Router("/api/stock/tocheckwarehouseinfo", &StockManagerApiController{}, "Get:CheckWarehouseInfo")
+	// beego.Router("/api/stock/returncheckwarehouseinfo", &StockManagerApiController{}, "Get:ReturnCheckWarehouseInfo")
+	// beego.Router("/api/stock/checkstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckStockWarehouseInfo")
+	// beego.Router("/api/stock/checkreturnstockwarehouseinfo", &StockManagerApiController{}, "Get:CheckReturnStockWarehouseInfo")
+	// beego.Router("/api/stock/getprintlist", &StockManagerApiController{}, "Get:GetPrintList")
+
+	// beego.Router("/api/stock/getwarehouseinfolist", &StockManagerApiController{}, "Get:GetInvetoryWarehouseInfoList")
+
+	// //结算成功后调用操作库存相关接口
+	// beego.Router("/api/settle/stock", &StockManagerApiController{}, "Get:HandleSettleStock")
+	// beego.Router("/api/settle/cancelstock", &StockManagerApiController{}, "Get:HandleRefundStock")
+
+	// beego.Router("/api/stock/getnewgoodwarehouseinfo", &StockManagerApiController{}, "Get:GetNewGoodWarehouseInfo")
+	// beego.Router("/api/stock/getnewwarehouseoutinfolist", &StockManagerApiController{}, "Get:GetNewWarehouseOutInfoList")
+
+	// beego.Router("/api/stock/getstockfloworderlist", &StockManagerApiController{}, "Get:GetStockFlowOrderList")
+
+	// beego.Router("/api/stock/getgoodpatientname", &StockManagerApiController{}, "Get:GetGoodPatientName")
+
+	// beego.Router("/api/drug/updatebasedruglisbyuserorgid", &StockManagerApiController{}, "Get:UpdateBaseDrugListByUserOrgID")
+
+	// beego.Router("/api/good/updategoodinfobyuserorgid", &StockManagerApiController{}, "Get:UpdateGoodInfoByUserOrgId")
+
+	// beego.Router("/api/good/getgoodstockinventorylist", &StockManagerApiController{}, "Get:GetGoodStockInventoryList")
+
+	// beego.Router("/api/good/getstockinventoryprintlist", &StockManagerApiController{}, "Get:GetStockInventoryPrintList")
+
+	// beego.Router("/api/good/getstockinventoymodeprintlist", &StockManagerApiController{}, "Get:GetStockInventoryModePrintList")
+}
+
+type _WarehousingInfoCreateParamModel struct {
+	StockIn []*_WarehousingInfoCreateParamStockInModel `json:"stockIn"`
+}
+
+type _WarehousingInfoCreateParamStockInModel struct {
+	ID               int64  `json:"id"`
+	GoodID           int64  `json:"good_id"` // 耗材id
+	GoodTypeID       int64  `json:"good_type_id"`
+	WarehousingCount string `json:"warehousing_count"` // 入库数量
+	Price            string `json:"price"`             // 进货价
+	PackingPrice     string `json:"packing_price"`     // 零售价
+	ExpiryDate       string `json:"expiry_date"`       // 过期时间（有效期）2006-01-02
+	ProductDate      string `json:"product_date"`      // 生产日期 2006-01-02
+	Number           string `json:"number"`            // 批号
+	Remark           string `json:"remark"`
+	Manufacturer     int64  `json:"manufacturer"`    // 生产商
+	Dealer           int64  `json:"dealer"`          // 经销商
+	LicenseNumber    string `json:"license_number"`  // 批准文号
+	RegisterNumber   string `json:"register_number"` // 注册编号
+	GoodCode         string `json:"good_code"`       // 追溯码
+}
+
+func (c *StockManagerV3ApiController) CreateWarehouse() {
+	warehousing_time := c.GetString("warehousing_time") // 入库时间
+	stockInOrderType, _ := c.GetInt64("type", 0)        // 入库单类型 1.耗材入库单 2.其他入库单（库存管理——其他管理）
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	// warehousing_info_id, _ := c.GetInt64("warehousing_info_id") // 入库单ID
+	ctime := time.Now().Unix()
+	adminUserInfo := c.GetAdminUserInfo()
+
+	// 校验参数
+	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
+	if parseDateErr != nil {
+		c.ErrorLog("warehousing_time(%v)解析错误：%v", warehousing_time, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if stockInOrderType != 1 && stockInOrderType != 2 {
+		c.ErrorLog("入库单类型不存在：type=%v", stockInOrderType)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if storehouse_id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	} else {
+		_, getErr := service.FindStoreHouseByStorehouseId(storehouse_id, adminUserInfo.CurrentOrgId)
+		if getErr != nil {
+			if getErr == gorm.ErrRecordNotFound {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStoreHouseNotExist)
+				return
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		}
+	}
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	warehousingTotalCount, getErr := service.FindNewAllWarehouseTotal(adminUserInfo.CurrentOrgId, tx)
+	if getErr != nil {
+		utils.ErrorLog("获取入库单数量失败：%v", getErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	warehousingTotalCount = warehousingTotalCount + 1
+	timeStr := time.Now().Format("20060102")
+	warehousing_order := "RKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeStr + "000" + strconv.FormatInt(warehousingTotalCount, 10)
+	operation_time := time.Now().Unix()
+	creater := adminUserInfo.AdminUser.Id
+	warehousing := models.Warehousing{
+		WarehousingOrder: warehousing_order,
+		OperationTime:    operation_time,
+		OrgId:            adminUserInfo.CurrentOrgId,
+		Creater:          creater,
+		Ctime:            ctime,
+		Mtime:            ctime,
+		Status:           1,
+		WarehousingTime:  warehousingDate.Unix(),
+		Type:             stockInOrderType,
+		StorehouseId:     storehouse_id,
+		IsCheck:          2,
+	}
+
+	createWarehousingErr := service.AddNewSigleWarehouse(&warehousing, tx)
+	if createWarehousingErr != nil {
+		utils.ErrorLog("新增入库单失败：%v", createWarehousingErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	// 重新读出刚写入的入库单
+	newWarehousing, getWarehousingErr := service.FindWareHouseByIdV3(warehousing.ID)
+	if getWarehousingErr != nil {
+		tx.Rollback()
+		utils.ErrorLog("获取刚写入的入库单(id=%v)失败：%v", warehousing.ID, getWarehousingErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	var bodyParams _WarehousingInfoCreateParamModel
+	jsonErr := json.Unmarshal(c.Ctx.Input.RequestBody, &bodyParams)
+	if jsonErr != nil {
+		tx.Rollback()
+		utils.ErrorLog("解析入库单详情失败：%v", jsonErr.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	// utils.InfoLog("%v", bodyParams)
+
+	if len(bodyParams.StockIn) > 0 {
+		for _, param := range bodyParams.StockIn {
+			productDateTS := int64(0)
+			if len(param.ProductDate) > 0 {
+				date, parseErr := utils.ParseTimeStringToTime("2006-01-02", param.ProductDate)
+				if parseErr == nil {
+					productDateTS = date.Unix()
+				}
+			}
+			expireDateTS := int64(0)
+			if len(param.ExpiryDate) > 0 {
+				date, parseErr := utils.ParseTimeStringToTime("2006-01-02", param.ExpiryDate)
+				if parseErr == nil {
+					expireDateTS = date.Unix()
+				}
+			}
+			warehousingCount, _ := strconv.ParseInt(param.WarehousingCount, 10, 64)
+
+			price, parseErr := strconv.ParseFloat(param.Price, 64)
+			if parseErr != nil {
+				tx.Rollback()
+				utils.ErrorLog("入库单详情入库价格格式错误(%v):%v", param.Price, parseErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+				return
+			}
+			packingPrice, _ := strconv.ParseFloat(param.PackingPrice, 64)
+
+			warehouseInfo := &models.WarehousingInfo{
+				ID:               0,
+				WarehousingOrder: warehousing_order,
+				WarehousingId:    newWarehousing.ID,
+				GoodId:           param.GoodID,
+				Number:           param.Number,
+				GoodTypeId:       param.GoodTypeID,
+				ProductDate:      productDateTS,
+				ExpiryDate:       expireDateTS,
+				WarehousingCount: warehousingCount,
+				Price:            price,
+				TotalPrice:       float64(warehousingCount) * price,
+				Status:           1,
+				Ctime:            warehousingDate.Unix(),
+				Mtime:            warehousingDate.Unix(),
+				Remark:           param.Remark,
+				OrgId:            adminUserInfo.CurrentOrgId,
+				Type:             stockInOrderType,
+				Manufacturer:     param.Manufacturer,
+				StockCount:       0,
+				Dealer:           param.Dealer,
+				LicenseNumber:    param.LicenseNumber,
+				PackingPrice:     packingPrice,
+				StorehouseId:     storehouse_id,
+				IsCheck:          2,
+				RegisterNumber:   param.RegisterNumber,
+				GoodCode:         param.GoodCode,
+			}
+
+			err := service.CreatedNewWarehouseingDetail(warehouseInfo, tx)
+			if err != nil {
+				utils.ErrorLog("入库单详情创建失败：%v", err)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		}
+	}
+
+	// 查询入库数据
+	var details []*models.VmWarehousingInfoSix
+
+	details, getErr = service.GetNewGoodWarehouseInfoById(newWarehousing.ID, newWarehousing.OrgId, tx)
+	if getErr != nil && getErr != gorm.ErrRecordNotFound {
+		utils.ErrorLog("入库单详情创建——查询详情失败：%v", getErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	tx.Commit()
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":               "入库成功",
+		"warehousing_order": warehousing_order,
+		"info":              newWarehousing,
+		"list":              details,
+	})
+}
+
+func (c *StockManagerV3ApiController) EditWarehouse() {
+	warehousing_time := c.GetString("warehousing_time") // 入库时间
+	stockInOrderType, _ := c.GetInt64("type", 0)        // 入库单类型 1.耗材入库单 2.其他入库单（库存管理——其他管理）
+	storehouse_id, _ := c.GetInt64("storehouse_id")
+	warehousing_id, _ := c.GetInt64("id") // 入库单ID
+	adminUserInfo := c.GetAdminUserInfo()
+
+	// 校验参数
+	warehousingDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", warehousing_time)
+	if parseDateErr != nil {
+		c.ErrorLog("warehousing_time(%v)解析错误：%v", warehousing_time, parseDateErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if stockInOrderType != 1 && stockInOrderType != 2 {
+		c.ErrorLog("入库单类型不存在：type=%v", stockInOrderType)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	if storehouse_id <= 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	} else {
+		_, getErr := service.FindStoreHouseByStorehouseId(storehouse_id, adminUserInfo.CurrentOrgId)
+		if getErr != nil {
+			if getErr == gorm.ErrRecordNotFound {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeStoreHouseNotExist)
+				return
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		}
+	}
+	var warehousing *models.Warehousing
+	if warehousing_id > 0 {
+		w, getErr := service.FindWareHouseByIdV3(warehousing_id)
+		if getErr != nil || w == nil {
+			if getErr == gorm.ErrRecordNotFound {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeWarehousingNotExist)
+				return
+			} else {
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+				return
+			}
+		}
+		warehousing = w
+
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeWarehousingNotExist)
+		return
+	}
+
+	// 开始外部循环的事务
+	db := service.XTWriteDB()
+	tx := db.Begin()
+
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	warehousing.WarehousingTime = warehousingDate.Unix()
+	warehousing.StorehouseId = storehouse_id
+	warehousing.Mtime = time.Now().Unix()
+
+	updateWarehousingErr := service.UpdateWarehousingAllValueV3WithTx(warehousing, tx)
+	if updateWarehousingErr != nil {
+		utils.ErrorLog("修改入库单(id=%v)失败：%v", warehousing_id, updateWarehousingErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	var bodyParams _WarehousingInfoCreateParamModel
+	jsonErr := json.Unmarshal(c.Ctx.Input.RequestBody, &bodyParams)
+	if jsonErr != nil {
+		tx.Rollback()
+		utils.ErrorLog("解析入库单详情失败：%v", jsonErr.Error())
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	details, getErr := service.GetWarehousingDetailsByWarehousingIDV3(warehousing.ID, warehousing.OrgId, tx)
+	if getErr != nil && getErr != gorm.ErrRecordNotFound {
+		utils.ErrorLog("入库单详情修改——查询详情失败：%v", getErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	if details == nil {
+		details = []*models.WarehousingInfo{}
+	}
+	// utils.InfoLog("%v", details)
+	if len(bodyParams.StockIn) > 0 {
+		for _, param := range bodyParams.StockIn {
+			productDateTS := int64(0)
+			if len(param.ProductDate) > 0 {
+				date, parseErr := utils.ParseTimeStringToTime("2006-01-02", param.ProductDate)
+				if parseErr == nil {
+					productDateTS = date.Unix()
+				}
+			}
+			expireDateTS := int64(0)
+			if len(param.ExpiryDate) > 0 {
+				date, parseErr := utils.ParseTimeStringToTime("2006-01-02", param.ExpiryDate)
+				if parseErr == nil {
+					expireDateTS = date.Unix()
+				}
+			}
+			warehousingCount, _ := strconv.ParseInt(param.WarehousingCount, 10, 64)
+
+			price, parseErr := strconv.ParseFloat(param.Price, 64)
+			if parseErr != nil {
+				tx.Rollback()
+				utils.ErrorLog("入库单详情入库价格格式错误(%v):%v", param.Price, parseErr)
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamFormatWrong)
+				return
+			}
+			packingPrice, _ := strconv.ParseFloat(param.PackingPrice, 64)
+
+			if param.ID == 0 {
+				warehouseInfo := &models.WarehousingInfo{
+					ID:               0,
+					WarehousingOrder: warehousing.WarehousingOrder,
+					WarehousingId:    warehousing.ID,
+					GoodId:           param.GoodID,
+					Number:           param.Number,
+					GoodTypeId:       param.GoodTypeID,
+					ProductDate:      productDateTS,
+					ExpiryDate:       expireDateTS,
+					WarehousingCount: warehousingCount,
+					Price:            price,
+					TotalPrice:       float64(warehousingCount) * price,
+					Status:           1,
+					Ctime:            warehousingDate.Unix(),
+					Mtime:            warehousingDate.Unix(),
+					Remark:           param.Remark,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Type:             stockInOrderType,
+					Manufacturer:     param.Manufacturer,
+					StockCount:       0,
+					Dealer:           param.Dealer,
+					LicenseNumber:    param.LicenseNumber,
+					PackingPrice:     packingPrice,
+					StorehouseId:     storehouse_id,
+					IsCheck:          2,
+					RegisterNumber:   param.RegisterNumber,
+					GoodCode:         param.GoodCode,
+				}
+				err := service.CreatedNewWarehouseingDetail(warehouseInfo, tx)
+				if err != nil {
+					utils.ErrorLog("入库单详情创建失败：%v", err)
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+					return
+				}
+			} else {
+				for _, detail := range details {
+					if detail.ID == param.ID {
+						detail.GoodId = param.GoodID
+						detail.Number = param.Number
+						detail.GoodTypeId = param.GoodTypeID
+						detail.ProductDate = productDateTS
+						detail.ExpiryDate = expireDateTS
+						detail.WarehousingCount = warehousingCount
+						detail.Price = price
+						detail.TotalPrice = float64(warehousingCount) * price
+						detail.Mtime = warehousingDate.Unix()
+						detail.Remark = param.Remark
+						detail.Type = stockInOrderType
+						detail.Manufacturer = param.Manufacturer
+						detail.Dealer = param.Dealer
+						detail.LicenseNumber = param.LicenseNumber
+						detail.PackingPrice = packingPrice
+						detail.StorehouseId = storehouse_id
+						detail.RegisterNumber = param.RegisterNumber
+						detail.GoodCode = param.GoodCode
+
+						err := service.UpdateWarehousingDetailV3WithTx(detail, tx)
+						if err != nil {
+							utils.ErrorLog("入库单详情修改失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						break
+					}
+				}
+			}
+		}
+	}
+
+	// 查询入库数据
+	var detailVMs []*models.VmWarehousingInfoSix
+
+	detailVMs, getErr = service.GetNewGoodWarehouseInfoById(warehousing.ID, warehousing.OrgId, tx)
+	if getErr != nil && getErr != gorm.ErrRecordNotFound {
+		utils.ErrorLog("入库单详情创建——查询详情失败：%v", getErr)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+
+	tx.Commit()
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg":  "编辑成功",
+		"list": detailVMs,
+	})
+
+}
+
+func (this *StockManagerApiController) GetWarehouseDetailList() {
+	page, _ := this.GetInt64("page", 0)
+	limit, _ := this.GetInt64("limit", 0)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	types, _ := this.GetInt64("type", 0) // 1.入库 2.出库 3.退货 4.退库
+	keywords := this.GetString("keywords")
+
+	manufacturer, _ := this.GetInt64("manufacturer", 0) // 生产商
+	order_type, _ := this.GetInt64("order_type", 0)
+	dealer, _ := this.GetInt64("dealer", 0) // 经销商
+
+	storehouse_id, _ := this.GetInt64("storehouse_id")
+
+	good_id, _ := this.GetInt64("good_id") // 耗材
+
+	order_way, _ := this.GetInt64("order_way") // 出库方式 0不限 1手动出库 2自动出库
+
+	// timeLayout := "2006-01-02"
+	// loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.Parse("2006-01-02 15:04:05", start_time+" 00:00:00")
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.Parse("2006-01-02 15:04:05", end_time+" 23:59:59")
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	adminUserInfo := this.GetAdminUserInfo()
+
+	var list []*models.WarehousingInfo
+	var list1 []*models.WarehouseOutInfo
+	var list2 []*models.SalesReturnInfo
+	var list3 []*models.CancelStockInfo
+
+	var total int64
+	var err error
+	var total_price float64
+	houseList, _ := service.GetAllStoreHouseList(adminUserInfo.CurrentOrgId)
+	manufacturerList, _ := service.GetAllManufacturerList(adminUserInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminUserInfo.CurrentOrgId)
+	patientsList, _ := service.GetAllpatient(adminUserInfo.CurrentOrgId)
+	var goodKind = "耗材种类"
+	goodKindParent, _ := service.GetDrugDataConfig(0, goodKind)
+	goodKindList, _ := service.GetParentDataConfig(goodKindParent.ID, adminUserInfo.CurrentOrgId)
+	if types == 1 {
+		list, total, err = service.FindStockInDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+		_, total_price = service.GetStockInDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":             list,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
+				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+
+	} else if types == 2 {
+		list1, total, err = service.FindStockOutDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id, order_way)
+		_, total_price = service.GetStockOutDetailTotal(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id, order_way)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":             list1,
+				"total":            total,
+				"total_price":      total_price,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
+				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	} else if types == 3 {
+		list2, total, err = service.FindSalesReturnDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer)
+
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":             list2,
+				"total":            total,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
+				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	} else if types == 4 {
+		list3, total, err = service.FindCancelDetailList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+		listGroup, err := service.FindeCancelGroup(adminUserInfo.CurrentOrgId, startTime, endTime, keywords, manufacturer, order_type, dealer, storehouse_id, good_id)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"list":             list3,
+				"total":            total,
+				"listgroup":        listGroup,
+				"houseList":        houseList,
+				"manufacturerList": manufacturerList,
+				"dealerList":       dealerList,
+				"patientsList":     patientsList,
+				"goodKindList":     goodKindList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+
+}

enums/error_code.go

@@ -291,6 +291,9 @@ const ( // ErrorCode
 	ErrorCodeFlow = 600000014
 
 	ErrorCodePrescription = 600000015
+
+	ErrorCodeStoreHouseNotExist  = 600000016
+	ErrorCodeWarehousingNotExist = 600000017
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -558,6 +561,9 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
 	ErrorCodeFlow:           "网络错误,数据异常,审核失败",
 	ErrorCodePrescription:   "请先开处方",
+
+	ErrorCodeStoreHouseNotExist:  "仓库不存在",
+	ErrorCodeWarehousingNotExist: "入库单不存在",
 }
 
 type SGJError struct {

models/stock_models.go

@@ -248,12 +248,12 @@ type WarehouseOut struct {
 	Manufacturers           Manufacturer `gorm:"ForeignKey:ID;AssociationForeignKey:Manufacturer" json:"Manufacturer"`
 	Dealers                 Dealer       `gorm:"ForeignKey:ID;AssociationForeignKey:Dealer" json:"Dealer"`
 	Type                    int64        `gorm:"column:type" json:"type"`
-	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"`
+	IsSys                   int64        `gorm:"column:is_sys" json:"is_sys"` // 0.手动 1.自动
 	SupplyCancelOutId       int64        `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
 	SupplyWarehouseId       int64        `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 	StorehouseId            int64        `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseId       int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
-	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	IsCheck                 int64        `gorm:"column:is_check" json:"is_check" form:"is_check"` // 2.未审核 1.审核
 	OrderId                 int64        `gorm:"column:order_id" json:"order_id" form:"order_id"`
 }
 

routers/router.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/controllers"
 	m_api "XT_New/controllers/mobile_api_controllers"
 	new_m_api "XT_New/controllers/new_mobile_api_controllers"
+
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/plugins/cors"
 )
@@ -36,6 +37,7 @@ func init() {
 	controllers.StockApiRegistRouters()
 	controllers.StockGoodApiRegistRouters()
 	controllers.StockManagerApiRegistRouters()
+	controllers.StockManagerV3ApiRegistRouters()
 	controllers.PatientScheduleTemplateAPIControllerRegistRouters()
 	controllers.DialysisRecordAPIControllerRegistRouter()
 	controllers.InspectionApiRegistRouters()

service/stock_service_v3.go

@@ -0,0 +1,68 @@
+package service
+
+import (
+	"XT_New/models"
+
+	"github.com/jinzhu/gorm"
+)
+
+func FindWareHouseByIdV3(id int64) (*models.Warehousing, error) {
+	warehouse := &models.Warehousing{}
+	err := readDb.Model(&models.Warehousing{}).Where("id = ? AND status = 1", id).First(&warehouse).Error
+	return warehouse, err
+}
+
+func UpdateWarehousingsStoreHouse(warehousingID int64, storehouseID int64, tx *gorm.DB) error {
+	err := tx.Model(&models.Warehousing{}).Where("id = ? and status = 1", warehousingID).Update(map[string]interface{}{"storehouse_id": storehouseID}).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetAllDealerListV3WithTx(orgid int64, tx *gorm.DB) (list []*models.Dealer, err error) {
+	err = tx.Model(models.Dealer{}).Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		tx.Rollback()
+		return
+	}
+	return
+}
+
+func GetAllManufacturerListV3WithTx(orgid int64, tx *gorm.DB) (list []*models.Manufacturer, err error) {
+	err = tx.Model(models.Manufacturer{}).Where("org_id = ? and status = 1", orgid).Find(&list).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		tx.Rollback()
+		return
+	}
+	return
+}
+
+func UpdateWarehousingAllValueV3WithTx(warehouse *models.Warehousing, tx *gorm.DB) error {
+	err := tx.Model(models.Warehousing{}).Save(warehouse).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func UpdateWarehousingDetailV3WithTx(detail *models.WarehousingInfo, tx *gorm.DB) error {
+	err := tx.Model(models.WarehousingInfo{}).Save(detail).Error
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetWarehousingDetailsByWarehousingIDV3(waresingID int64, orgid int64, tx *gorm.DB) ([]*models.WarehousingInfo, error) {
+	var details []*models.WarehousingInfo
+	err := tx.Where("org_id = ? and status = 1 and warehousing_id = ?", orgid, waresingID).Find(&details).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		tx.Rollback()
+		return nil, err
+	}
+	return details, nil
+}