Browse Source

卷标签

master
Rui_Li 4 years ago
parent
commit
e832196c15
  1. 10
      src/main/java/com/gaotao/modules/purchasingManagement/dao/MaterialSplitMapper.java
  2. 4
      src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java
  3. 13
      src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

10
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 org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author rq * @author rq
@ -375,4 +376,13 @@ public interface MaterialSplitMapper {
* @throw * @throw
*/ */
void notFreezing(SearchRollInformationData inData); void notFreezing(SearchRollInformationData inData);
/**
* @Author LR
* @Description 获取分切材料打印的数据
* @DateTime 2022/4/24 16:19
* @Param [site, rollNo]
* @return java.util.Map<java.lang.String,java.lang.Object>
**/
Map<String, Object> getSplitPrintMaterialRoll(CRollInfoData inData);
} }

4
src/main/java/com/gaotao/modules/purchasingManagement/service/Impl/MaterialSplitServiceImpl.java

@ -60,6 +60,8 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
public ResponseData saveCRollData(List<CRollInfoData> inList) { public ResponseData saveCRollData(List<CRollInfoData> inList) {
ResponseData responseData = new ResponseData(); ResponseData responseData = new ResponseData();
List<SiteData> list3 = baseMapper.checkSiteId(inList.get(0).getSite()); List<SiteData> list3 = baseMapper.checkSiteId(inList.get(0).getSite());
//创建返回打印的数据
List<Map<String, Object>> printList = new ArrayList<>();
if (list3.size() == 0) { if (list3.size() == 0) {
responseData.setMsg("该工厂编码不存在!"); responseData.setMsg("该工厂编码不存在!");
responseData.setCode("500"); responseData.setCode("500");
@ -91,6 +93,8 @@ public class MaterialSplitServiceImpl implements MaterialSplitService {
inList.get(i).setWarehouseid(materialSplitMapper.getSysParamenter(inList.get(i).getSite(),179)); inList.get(i).setWarehouseid(materialSplitMapper.getSysParamenter(inList.get(i).getSite(),179));
} }
materialSplitMapper.saveCRollInfo(inList.get(i)); materialSplitMapper.saveCRollInfo(inList.get(i));
//查询出打印的数据
Map<String, Object> printMap = materialSplitMapper.getSplitPrintMaterialRoll(inList.get(i));
} }
} }
responseData.setCode("200"); responseData.setCode("200");

13
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} +'取消冻结' ) Update C_RollInfo Set frozenflag='N' ,frozendate= null,frozenby=null,OpsLog=(isnull(OpsLog,'')+#{user}+#{type} +'取消冻结' )
where site=#{site} and rollNo=#{rollNo} where site=#{site} and rollNo=#{rollNo}
</update> </update>
<!--2022-04-24 获取分切材料打印分切卷的标签-->
<select id="getSplitPrintMaterialRoll" parameterType="com.gaotao.modules.purchasingManagement.entity.CRollInfoData" resultType="java.util.HashMap">
SELECT cri.RollNo rollNo, cri.PartNo partNo,
(CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) supplierId,
dbo.Get_SupplierDesc(cri.Site, (CASE WHEN dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN cri.SupplierID ELSE dbo.Get_ReferenceInfo_SupplierID(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) END)) supplierDesc,
(CASE WHEN dbo.Get_ReferenceInfo_PartDesc(cri.Site, cri.PartNo, cri.CustomerID, cri.FGPartNo) = '' THEN pt.PartDescription ELSE dbo.Get_ReferenceInfo_PartDesc(cri.Site,cri.PartNo,cri.CustomerID,cri.FGPartNo) END) partDesc,
'' spec, cri.RollQty rollQty, pt.UMID umid, cri.RollDate rollDate, NULL expiredDate, cri.CreatedBy createdBy, pt.DefaultLocationID locationId
FROM C_RollInfo cri
LEFT JOIN Part pt ON cri.Site = pt.Site AND cri.PartNo = pt.PartNo
WHERE cri.Site = #{site} AND cri.RollNo = #{rollNo}
</select>
</mapper> </mapper>
Loading…
Cancel
Save