Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS

jiangshuai

2023-10-21 ea25d0bb100a95d043b420e5c32f86300bf19df4

 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)