提交 6328a8f7 作者: zhangqiliang

1.墙盒新增发货的时候,根据从订单表表中获取的物料编码到外联上获取物料名称

父级 3c2690a4
......@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.http.Header;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
......@@ -410,8 +411,12 @@ public class WarehouseController {
*/
@PostMapping(value = "warehouse/detail")
@ApiOperation(value = "查询仓库详情")
public BaseResponse<WarehouseDetail> warehouseDetail(String id) {
public BaseResponse<WarehouseDetail> warehouseDetail(String id,String materialCode) {
WarehouseDetail warehouseDetail = warehouseMapperEx.warehouseDetailById(id);
MaterialsEx materials=materialsMapperEx.materialsByMaterialsCode(materialCode);
if (!StringUtils.isEmpty(materials)){
warehouseDetail.setMaterialsName(materials.getMaterialsName());
}
return new BaseResponse<WarehouseDetail>(warehouseDetail);
}
}
......@@ -184,12 +184,7 @@
select id,name from t_warehouse where id = #{superiorWarehouseId}
</select>
<select id="warehouseDetailById" parameterType="string" resultType="com.boco.nbd.wios.manage.entity.bo.WarehouseDetail">
select tw.id,tw.name,tw.receive_people,tw.receive_phone,ts.materials_name
from t_warehouse tw
left join t_warehouse_materials tm on tm.warehouse_id = tw.id
left join t_materials ts on ts.id = tm.materials_id
where tw.id = #{id}
GROUP BY tw.id
select id,name,receive_people,receive_phone from t_warehouse where id = #{id}
</select>
</mapper>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论