库存查询新增货位查询,耗材字典问题

master
anthonywj 2 years ago
parent fff8e388fc
commit 0bd6f7294b

@ -88,7 +88,7 @@ public class UdiContrastController {
List<UdiRelevanceResponse> temps = udiContrastService.findByUnion(key, udiCombineRequest.getThirdId()); List<UdiRelevanceResponse> temps = udiContrastService.findByUnion(key, udiCombineRequest.getThirdId());
if (CollUtil.isNotEmpty(temps)) { if (CollUtil.isNotEmpty(temps)) {
UdiRelevanceResponse temp = temps.get(0); UdiRelevanceResponse temp = temps.get(0);
CompanyEntity companyEntity = companyService.findCompany(udiCombineRequest.getCustomerId()+""); CompanyEntity companyEntity = companyService.findCompany(udiCombineRequest.getCustomerId() + "");
CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity(); CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
companyProductRelevanceEntity.setCreateTime(new Date()); companyProductRelevanceEntity.setCreateTime(new Date());
companyProductRelevanceEntity.setUpdateTime(new Date()); companyProductRelevanceEntity.setUpdateTime(new Date());
@ -183,7 +183,15 @@ public class UdiContrastController {
} }
} }
//关联第三方产品信息若无值则由第三方产品信息带过来
UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
if (StrUtil.isEmpty(udiProductEntity.getManufactory())) {
udiProductEntity.setManufactory(udiCombineRequest.getManufactory());
}
if (StrUtil.isEmpty(udiProductEntity.getMeasname())) {
udiProductEntity.setMeasname(udiCombineRequest.getMeasname());
}
udiProductService.updateUdiInfo(udiProductEntity);
return ResultVOUtils.success("更新成功"); return ResultVOUtils.success("更新成功");
} }

@ -96,7 +96,7 @@ public class SupCertController {
if (postSelCertRequest.getCertType() == null) { if (postSelCertRequest.getCertType() == null) {
return ResultVOUtils.error(500, "参数错误!"); return ResultVOUtils.error(500, "参数错误!");
} }
if(postSelCertRequest.getManufacturerIdFk()==null) { if (postSelCertRequest.getManufacturerIdFk() == null) {
String errMsg = ""; String errMsg = "";
ArrayList<String> list = new ArrayList<>(); ArrayList<String> list = new ArrayList<>();
int i = postSelCertRequest.getSupCertSetEntities().size(); int i = postSelCertRequest.getSupCertSetEntities().size();
@ -119,7 +119,6 @@ public class SupCertController {
} }
for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) {
SupCertEntity supCertEntity = new SupCertEntity(); SupCertEntity supCertEntity = new SupCertEntity();
supCertEntity.setName(supCertSetEntity.getName()); supCertEntity.setName(supCertSetEntity.getName());

@ -105,4 +105,9 @@ public class InvProductResponse {
*/ */
private String invCode; private String invCode;
/**
* todo
*/
private String spaceName;
} }

@ -24,13 +24,15 @@
auth_dept.name deptName, auth_dept.name deptName,
auth_warehouse.name invName, auth_warehouse.name invName,
ip.deptCode, ip.deptCode,
ip.invCode ip.invCode,
auth_space.name spaceName
from inv_product ip from inv_product ip
inner join basic_udirel on ip.relIdFk = basic_udirel.id inner join basic_udirel on ip.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId left join basic_corp on ip.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ip.deptCode left join auth_dept on auth_dept.code = ip.deptCode
left join auth_warehouse on auth_warehouse.code = ip.invCode left join auth_warehouse on auth_warehouse.code = ip.invCode
left join auth_space `as` on ip.invSpaceCode = `as`.code
<where> <where>
bp.diType = 1 bp.diType = 1
<if test="cpmctymc != null and cpmctymc != ''"> <if test="cpmctymc != null and cpmctymc != ''">
@ -72,6 +74,9 @@
<if test="invCode != null and invCode != ''"> <if test="invCode != null and invCode != ''">
AND ip.invCode = #{invCode} AND ip.invCode = #{invCode}
</if> </if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND invSpaceCode = #{invSpaceCode}
</if>
<if test="invCodes != null and invCodes.size() != 0"> <if test="invCodes != null and invCodes.size() != 0">
AND ip.invCode in AND ip.invCode in
<foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=","> <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
@ -301,7 +306,7 @@
bp.zczbhhzbapzbh, bp.zczbhhzbapzbh,
sum(ip.inCount) as inCount, sum(ip.inCount) as inCount,
sum(ip.outCount) as outCount, sum(ip.outCount) as outCount,
sum(ip.reCount)as reCount, sum(ip.reCount) as reCount,
ip.customerId, ip.customerId,
basic_corp.name supName, basic_corp.name supName,
ip.supId, ip.supId,
@ -366,5 +371,4 @@
group by ip.relIdFk group by ip.relIdFk
order by ip.updateTime desc order by ip.updateTime desc
</select> </select>
</mapper> </mapper>

Loading…
Cancel
Save