Merge remote-tracking branch 'origin/orderChange' into zhairh

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java
zhairh
x_z 3 years ago
commit b1d00997e2

@ -90,7 +90,7 @@ public class ThrProductsAddController {
} }
ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + ""); ThrProductsAddEntity tempEntity = thrProductsAddService.selectById(thrProductsAddEntity.getId() + "");
if (thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) { if (!thrProductsService.isExit(tempEntity.getCode(), tempEntity.getThirdSysFk())) {
return ResultVOUtils.error(500, "已存在相同产品编码,无法添加!"); return ResultVOUtils.error(500, "已存在相同产品编码,无法添加!");
} }
thrProductsAddService.updateThrProducts(thrProductsAddEntity); thrProductsAddService.updateThrProducts(thrProductsAddEntity);

@ -90,10 +90,6 @@ public class ThrProductsAddDiController {
FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
filterUdiInfoRequest.setNameCode(filterThrProductsRequest.getCode()); filterUdiInfoRequest.setNameCode(filterThrProductsRequest.getCode());
List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); List<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiInfoRequest);
if (temps != null && temps.size() > 0) {
filterThrProductsRequest.setUuid(temps.get(0).getUuid());
filterUdiInfoRequest.setNameCode(null);
}
} }
filterThrProductsRequest.setDiType(1); filterThrProductsRequest.setDiType(1);
List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest); List<ThrProductsAddDiResponse> thrProductsAddDiResponses = thrProductsAddDiService.filterThrProductsList(filterThrProductsRequest);

@ -99,7 +99,7 @@ public class ThrProductsController {
filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode()); filterUdiInfoRequest.setThirdId(thrProductsEntity.getCode());
} }
List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 1) {
return "该产品已与UDI码关联无法删除"; return "该产品已与UDI码关联无法删除";
} }
} }

@ -28,4 +28,5 @@ public class FilterThrProductsRequest extends ListPageRequest {
private Long id; private Long id;
private String uuid; private String uuid;
private Integer diType; private Integer diType;
private String companyName;
} }

@ -50,7 +50,7 @@
AND nameCode LIKE concat(#{nameCode},'%') AND nameCode LIKE concat(#{nameCode},'%')
</if> </if>
<if test="thirdId != '' and thirdId != null"> <if test="thirdId != '' and thirdId != null">
AND thirdId LIKE concat(#{thirdId},'%') AND thirdId LIKE #{thirdId}
</if> </if>
<if test="uuid != '' and uuid != null"> <if test="uuid != '' and uuid != null">
AND basic_udirel.uuid = #{uuid} AND basic_udirel.uuid = #{uuid}

@ -7,6 +7,7 @@
resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity"> resultType="com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity">
SELECT thr_products_add.*,basic_corp.name corpName FROM thr_products_add SELECT thr_products_add.*,basic_corp.name corpName FROM thr_products_add
left join basic_corp on thr_products_add.customerId = basic_corp.erpId left join basic_corp on thr_products_add.customerId = basic_corp.erpId
left join company on company.customerid=thr_products_add.customerid
<where> <where>
<if test="name != '' and name != null"> <if test="name != '' and name != null">
AND thr_products_add.name LIKE concat('%',#{name},'%') AND thr_products_add.name LIKE concat('%',#{name},'%')
@ -41,6 +42,9 @@
<if test="customerId != '' and customerId != null"> <if test="customerId != '' and customerId != null">
AND customerId = #{customerId} AND customerId = #{customerId}
</if> </if>
<if test="companyName != '' and companyName != null">
AND companyName = #{companyName}
</if>
</where> </where>
group by thr_products_add.id group by thr_products_add.id

@ -96,6 +96,7 @@
p.zczbhhzbapzbh p.zczbhhzbapzbh
FROM thr_products_add_di tdi FROM thr_products_add_di tdi
LEFT JOIN productinfo p ON tdi.uuid = p.uuid LEFT JOIN productinfo p ON tdi.uuid = p.uuid
LEFT JOIN company c on c.customerId=tdi.customerId
<where> <where>
<if test="checkStatus != null"> <if test="checkStatus != null">
AND tdi.status = #{checkStatus} AND tdi.status = #{checkStatus}
@ -124,6 +125,9 @@
<if test="diType != '' and diType != null"> <if test="diType != '' and diType != null">
AND p.diType = #{diType} AND p.diType = #{diType}
</if> </if>
<if test="companyName != '' and companyName != null">
AND c.companyName = #{companyName}
</if>
</where> </where>
order by tdi.createTime DESC order by tdi.createTime DESC

Loading…
Cancel
Save