jiangshuai
2023-10-21 ea25d0bb100a95d043b420e5c32f86300bf19df4
Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS
3个文件已修改
16 ■■■■■ 已修改文件
controllers/product_controller.go 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/report_forms_controller.go 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
docs/docs.go 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
controllers/product_controller.go
@@ -38,10 +38,6 @@
        util.ResponseFormat(c, code.RequestParamError, "产品名称不能为空")
        return
    }
    if params.SalePrice.IntPart() <= 0 {
        util.ResponseFormat(c, code.RequestParamError, "产品售价不能小于等于零")
        return
    }
    if params.Model == "" {
        util.ResponseFormat(c, code.RequestParamError, "物料类型不能为空")
        return
@@ -137,10 +133,6 @@
    }
    if params.Name == "" {
        util.ResponseFormat(c, code.RequestParamError, "产品名称不能为空")
        return
    }
    if params.SalePrice.IntPart() <= 0 {
        util.ResponseFormat(c, code.RequestParamError, "产品售价不能小于等于零")
        return
    }
    if params.Model == "" {
controllers/report_forms_controller.go
@@ -69,11 +69,11 @@
    dbIn := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
        Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id").
        Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeIncoming).
        Where("wms_operation.status in (?)", []int{3, 4})
        Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
    dbOut := models.NewOperationDetailsSearch().Orm.Model(&models.OperationDetails{}).
        Joins("left join wms_operation ON wms_operation_details.operation_id=wms_operation.id").
        Where("wms_operation.base_operation_type=?", constvar.BaseOperationTypeOutgoing).
        Where("wms_operation.status in (?)", []int{3, 4})
        Where("wms_operation.base_operation_type in (?)", []int{2, 4}).
        Where("wms_operation.status = ?", constvar.OperationStatus_Finish)
    if len(locationIds) > 0 {
        dbIn.Where("wms_operation.to_location_id in (?)", locationIds)
        dbOut.Where("wms_operation.from_location_id in (?)", locationIds)
docs/docs.go
@@ -3724,6 +3724,8 @@
    Description:      "",
    InfoInstanceName: "swagger",
    SwaggerTemplate:  docTemplate,
    LeftDelim:        "{{",
    RightDelim:       "}}",
}
func init() {