diff --git a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java index bbe5a67..018897c 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/controller/PRHeaderController.java @@ -1,6 +1,5 @@ package com.gaotao.modules.purchaseorder.controller; -import com.gaotao.common.exception.ResponseEnum; import com.gaotao.common.utils.PageUtils; import com.gaotao.common.utils.R; import com.gaotao.modules.app.entity.Supplier; @@ -17,9 +16,9 @@ import com.gaotao.modules.purchaseorder.query.TblBaseDataQuery; import com.gaotao.modules.purchaseorder.service.AuthorizationHistService; import com.gaotao.modules.purchaseorder.service.PRHeaderService; import com.gaotao.modules.purchaseorder.service.TblBaseDataService; +import com.gaotao.modules.toolman.query.ToolDetailQuery; import com.gaotao.modules.toolman.service.FileAssociateService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -267,4 +266,9 @@ public class PRHeaderController { return R.ok("操作成功!"); } -} + @PostMapping("updateReceiveToolDetail") + public R updateReceiveToolDetail(@RequestBody ToolDetailQuery toolDetailQuery){ + prHeaderService.updateReceiveToolDetail( toolDetailQuery); + return R.ok("操作成功!"); + } +} \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java b/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java index 8f4f698..c1e1aa5 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/dao/PRHeaderMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.gaotao.modules.purchaseorder.entity.PRHeader; import com.gaotao.modules.purchaseorder.query.PRHeaderQuery; -import com.gaotao.modules.toolman.entity.ViewIfsTool; +import com.gaotao.modules.toolman.query.ToolDetailQuery; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -68,4 +68,15 @@ public interface PRHeaderMapper extends BaseMapper { String getTransNo(@Param("site") String site,@Param("dbType") String dbType); void updateTransNo(@Param("site") String site,@Param("dbType") String dbType); + + + /** + * @author: sxm + * @description: 修改 + * @param [toolDetailQuery] + * @return: void + * @date: 2022/11/1 10:43 + */ + void updateReceiveToolDetail(ToolDetailQuery toolDetailQuery); + } \ No newline at end of file diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/PRHeaderService.java b/src/main/java/com/gaotao/modules/purchaseorder/service/PRHeaderService.java index 9768e28..ea5b571 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/PRHeaderService.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/service/PRHeaderService.java @@ -6,6 +6,7 @@ import com.gaotao.modules.purchaseorder.entity.PRDetail; import com.gaotao.modules.purchaseorder.entity.PRHeader; import com.gaotao.modules.purchaseorder.query.PRDetailQuery; import com.gaotao.modules.purchaseorder.query.PRHeaderQuery; +import com.gaotao.modules.toolman.query.ToolDetailQuery; import java.util.List; @@ -53,4 +54,14 @@ public interface PRHeaderService extends IService { * @date: 2022/7/29 13:27 */ Integer getReviewToolCount(PRDetailQuery prDetailQuery); + + /** + * @author: sxm + * @description: 修改工具编码 + * @param [toolDetailQuery] + * @return: void + * @date: 2022/11/1 10:42 + */ + void updateReceiveToolDetail(ToolDetailQuery toolDetailQuery); + } diff --git a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java index d0c7521..26802dc 100644 --- a/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchaseorder/service/impl/PRHeaderServiceImpl.java @@ -24,6 +24,7 @@ import com.gaotao.modules.purchaseorder.service.PRHeaderService; import com.gaotao.modules.toolman.dao.IfsToolMapper; import com.gaotao.modules.toolman.entity.ToolHeader; import com.gaotao.modules.toolman.query.IfsToolQuery; +import com.gaotao.modules.toolman.query.ToolDetailQuery; import com.gaotao.modules.toolman.query.ToolHeaderQuery; import com.gaotao.modules.toolman.service.ToolHeaderService; import org.springframework.beans.factory.annotation.Autowired; @@ -215,4 +216,11 @@ public class PRHeaderServiceImpl extends ServiceImpl i authorizationHistMapper.updateAuthorizationHist(authorizationHist); prHeaderMapper.updatePRHeader(prHeaderQuery); } + + @Override + @Transactional + public void updateReceiveToolDetail(ToolDetailQuery toolDetailQuery) { + toolHeaderService.updateToolDetail( toolDetailQuery); + prHeaderMapper.updateReceiveToolDetail(toolDetailQuery); + } } diff --git a/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml b/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml index 4fe28b5..1484e1e 100644 --- a/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml +++ b/src/main/resources/mapper/purchaseorder/PRHeaderMapper.xml @@ -273,4 +273,8 @@ exec dbo.UpdateTransNo #{site},#{dbType} + + update po_receipt_detail_sub set tool_instance_id = #{newToolInstanceId} + where tool_instance_id = #{toolInstanceId} and site = #{site} + \ No newline at end of file