mainqaq před 2 roky
rodič
revize
006d9d86c2

+ 4 - 2
controllers/drug_pharmacy_management_controller.go Zobrazit soubor

469
 func (this *PharmacyApiController) SaveSetting() {
469
 func (this *PharmacyApiController) SaveSetting() {
470
 	var err error
470
 	var err error
471
 	defer func() {
471
 	defer func() {
472
-		if err != nil{
473
-			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId,this.Ctx.Input,err)
472
+		if err != nil {
473
+			service.SaveErrs(this.GetAdminUserInfo().CurrentOrgId, this.Ctx.Input, err)
474
 		}
474
 		}
475
 	}()
475
 	}()
476
 	is_open, _ := this.GetInt64("is_open")
476
 	is_open, _ := this.GetInt64("is_open")
492
 	}
492
 	}
493
 	if is_open == 2 {
493
 	if is_open == 2 {
494
 		err = fmt.Errorf("用户关闭药房管理出库")
494
 		err = fmt.Errorf("用户关闭药房管理出库")
495
+	} else {
496
+		err = fmt.Errorf("用户开启药房管理出库")
495
 	}
497
 	}
496
 
498
 
497
 	this.ServeSuccessJSON(map[string]interface{}{
499
 	this.ServeSuccessJSON(map[string]interface{}{

+ 6 - 0
service/pharmacy_service.go Zobrazit soubor

727
 	}
727
 	}
728
 	for _, v := range advice_info {
728
 	for _, v := range advice_info {
729
 		//扣减库存
729
 		//扣减库存
730
+		if !IsPharmacyDelivery(v.DrugId, orgid) {
731
+			continue
732
+		}
730
 		err = DrugAutoAddCancelInfo(v, creater)
733
 		err = DrugAutoAddCancelInfo(v, creater)
731
 		if err != nil {
734
 		if err != nil {
732
 			err = fmt.Errorf("!:%v", err)
735
 			err = fmt.Errorf("!:%v", err)
771
 	}
774
 	}
772
 	for _, v := range advice {
775
 	for _, v := range advice {
773
 		//扣减库存
776
 		//扣减库存
777
+		if !IsPharmacyDelivery(v.DrugId, orgid) {
778
+			continue
779
+		}
774
 		err = DrugAutoAddCancelInfo(v, creater)
780
 		err = DrugAutoAddCancelInfo(v, creater)
775
 		if err != nil {
781
 		if err != nil {
776
 			err = fmt.Errorf("!:%v", err)
782
 			err = fmt.Errorf("!:%v", err)