diff --git a/src/main/java/com/gaotao/modules/purchasingManagement/dao/MaterialSplitMapper.java b/src/main/java/com/gaotao/modules/purchasingManagement/dao/MaterialSplitMapper.java index cc9fd14..4cc3346 100644 --- a/src/main/java/com/gaotao/modules/purchasingManagement/dao/MaterialSplitMapper.java +++ b/src/main/java/com/gaotao/modules/purchasingManagement/dao/MaterialSplitMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * @author rq @@ -375,4 +376,13 @@ public interface MaterialSplitMapper { * @throw */ void notFreezing(SearchRollInformationData inData); + + /** + * @Author LR + * @Description 获取分切材料打印的数据 + * @DateTime 2022/4/24 16:19 + * @Param [site, rollNo] + * @return java.util.Map + **/ + Map getSplitPrintMaterialRoll(CRollInfoData inData); } diff --git a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java index 8eae6c3..8adbff9 100644 --- a/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java @@ -60,6 +60,8 @@ public class MaterialSplitServiceImpl implements MaterialSplitService { public ResponseData saveCRollData(List inList) { ResponseData responseData = new ResponseData(); List list3 = baseMapper.checkSiteId(inList.get(0).getSite()); + //创建返回打印的数据 + List> printList = new ArrayList<>(); if (list3.size() == 0) { responseData.setMsg("该工厂编码不存在!"); responseData.setCode("500"); @@ -91,6 +93,8 @@ public class MaterialSplitServiceImpl implements MaterialSplitService { inList.get(i).setWarehouseid(materialSplitMapper.getSysParamenter(inList.get(i).getSite(),179)); } materialSplitMapper.saveCRollInfo(inList.get(i)); + //查询出打印的数据 + Map printMap = materialSplitMapper.getSplitPrintMaterialRoll(inList.get(i)); } } responseData.setCode("200"); diff --git a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml index ba326a7..5914eb8 100644 --- a/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml +++ b/src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml @@ -332,4 +332,17 @@ Update C_RollInfo Set frozenflag='N' ,frozendate= null,frozenby=null,OpsLog=(isnull(OpsLog,'')+#{user}+#{type} +'取消冻结' ) where site=#{site} and rollNo=#{rollNo} + + + \ No newline at end of file