diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java index 97a49fc..fbaf337 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/AppBackApplyController.java @@ -220,6 +220,7 @@ public class AppBackApplyController extends BaseController { } for (BackApplyInfo backApplyInfo : record.getBackApplyDetails()) { backApplyInfo.setParentId(record.getParentId()); + backApplyService.updateBackInfo(record.getParentId(),record.getCompanyId()); boolean re = backApplyService.upload(backApplyInfo) > 0; if (!re) { return AjaxResult.error("退料任务明细插入失败"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java index 3563a06..747d032 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/AppBackApplyAppMapper.java @@ -5,6 +5,7 @@ import com.bonus.sgzb.app.domain.TmTask; import com.bonus.sgzb.base.api.domain.BackApplyInfo; import com.bonus.sgzb.base.api.domain.MachinePart; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -57,4 +58,6 @@ public interface AppBackApplyAppMapper { List getMaTypeDetails(BackApplyInfo backApplyInfo); MachinePart getMachineParts(TmTask typeId); + + void updateBackInfo(@Param("parentId") Integer parentId, @Param("companyId") String companyId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java index a2da06f..962a5e0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/AppBackApplyService.java @@ -112,4 +112,6 @@ public interface AppBackApplyService { * @return int */ int refuse(BackApplyInfo record); + + void updateBackInfo(Integer parentId, String companyId); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java index 651e1f2..9a0537c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/AppBackApplyServiceImpl.java @@ -203,4 +203,9 @@ public class AppBackApplyServiceImpl implements AppBackApplyService { return 1; } + @Override + public void updateBackInfo(Integer parentId, String companyId) { + appBackApplyMapper.updateBackInfo(parentId,companyId); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml index 86887f8..0aa4117 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/AppBackApplyAppMapper.xml @@ -337,6 +337,9 @@ WHERE bai.id = #{id} + + update back_apply_info set company_id = #{companyId} where id = #{parentId} + DELETE