diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java index c5cf64b2..98b1241e 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnIssureNotifyServiceImpl.java @@ -10,6 +10,7 @@ import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderList import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderMaterialListAllocData; import com.gaotao.modules.autoWareHourceHaian.entity.HaiAnSOIssueNotifyOrderMaterialListData; import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnGroupKey; +import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNoOrderMaterialAllocRequestData; import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNoOrderNotifyDto; import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnNewSoIssueNotifyDto; import com.gaotao.modules.autoWareHourceHaian.entity.dto.HaiAnShoporderAndMaterialDto; @@ -17,8 +18,8 @@ import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnSOIssueNotifyOrderL import com.gaotao.modules.autoWareHourceHaian.entity.vo.HaiAnSOIssueNotifyOrderMaterialList; import com.gaotao.modules.customer.entity.dto.ShipmentIssueDto; import com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnIssureNotifyMapper; -import com.gaotao.modules.autoWareHourceHaian.mapper.HaiAnSOIssueNotifyOrderMaterialListAllocMapper; import com.gaotao.modules.autoWareHourceHaian.service.HaiAnIssureNotifyService; +import com.gaotao.modules.autoWareHourceHaian.service.HaiAnSOIssueNotifyOrderMaterialListAllocService; import com.gaotao.modules.sys.entity.SysUserEntity; import com.gaotao.modules.trans.entity.TransNoControl; import com.gaotao.modules.trans.service.Consts; @@ -49,7 +50,7 @@ public class HaiAnIssureNotifyServiceImpl implements HaiAnIssureNotifyService { private HaiAnIssureNotifyMapper haiAnIssureNotifyMapper; @Autowired - private HaiAnSOIssueNotifyOrderMaterialListAllocMapper allocMapper; + private HaiAnSOIssueNotifyOrderMaterialListAllocService allocService; @Autowired private IfsApiService ifsApiService; @@ -564,6 +565,29 @@ public class HaiAnIssureNotifyServiceImpl implements HaiAnIssureNotifyService { } } + /** + * @author rqrq + * @Description 查询海安无单物料行指定分配列表,委托allocService按site+notifyNo+itemNo+BOM行号检索 - rqrq + */ + @Override + public List haiAnQueryNoOrderMaterialAllocList(HaiAnNoOrderMaterialAllocRequestData data) { + validateSite(data.getSite()); + // 调用指定分配服务查询当前物料行全量指定记录;失败直接抛出业务异常供前端提示 - rqrq + return allocService.queryAllocList(data); + } + + /** + * @author rqrq + * @Description 全量保存海安无单物料行指定分配,委托allocService执行校验、排序与删后重存 - rqrq + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void haiAnSaveNoOrderMaterialAllocList(HaiAnNoOrderMaterialAllocRequestData data) { + validateSite(data.getSite()); + // 调用指定分配服务全量重存;事务失败会回滚,避免删后残留空数据 - rqrq + allocService.saveAllocList(data); + } + private HaiAnSOIssueNotifyOrderList buildParentSeed(HaiAnNewSoIssueNotifyDto data) { HaiAnSOIssueNotifyOrderList seed = new HaiAnSOIssueNotifyOrderList(); seed.setSite(data.getSite());