|
@@ -3966,13 +3966,13 @@ func (c *HisApiController) DeleteProject() {
|
3966
|
3966
|
label.Status = 0
|
3967
|
3967
|
service.CreateHisLabelRecord(&label)
|
3968
|
3968
|
|
|
3969
|
+ fmt.Println(goodOutConfig.IsOpen)
|
3969
|
3970
|
if goodOutConfig.IsOpen != 1 {
|
3970
|
3971
|
if stockConfig.IsOpen == 1 {
|
3971
|
3972
|
if project.Type == 2 {
|
3972
|
3973
|
err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
|
3973
|
3974
|
fmt.Println(err)
|
3974
|
3975
|
}
|
3975
|
|
-
|
3976
|
3976
|
if project.Type == 3 && project.IsOut == 1 {
|
3977
|
3977
|
|
3978
|
3978
|
houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
|
|
@@ -4224,12 +4224,15 @@ func (c *HisApiController) DeleteProject() {
|
4224
|
4224
|
fmt.Println(err)
|
4225
|
4225
|
}
|
4226
|
4226
|
|
|
4227
|
+ } else {
|
|
4228
|
+ err := service.DelelteProject(id, c.GetAdminUserInfo().CurrentOrgId)
|
|
4229
|
+ fmt.Println(err)
|
|
4230
|
+
|
4227
|
4231
|
}
|
4228
|
4232
|
}
|
4229
|
4233
|
|
4230
|
4234
|
//保存处方出库
|
4231
|
4235
|
if goodOutConfig.IsOpen == 1 {
|
4232
|
|
-
|
4233
|
4236
|
if project.Type == 3 {
|
4234
|
4237
|
houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
|
4235
|
4238
|
good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
|