github-mirrors/No1WMS
1
0
Fork 0
mirror of https://github.com/suhf/No1WMS.git synced 2026-02-04 19:54:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

planin url 관련 버그 수정

Browse Source
This commit is contained in:
Suh
2024-01-19 22:14:52 +09:00
parent 6641e4ac9b
commit 04392168ba
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/no1/wms/planin/PlanInController.java
View File

@@ -112,9 +112,9 @@ public class PlanInController {
// 엑셀 다운로드 // 엑셀 다운로드
@GetMapping("/qr/{id}") @GetMapping("/qr/{id}")
@ResponseBody @ResponseBody
public String qr(@PathVariable("id")String id, HttpServletResponse response) public String qr(@PathVariable("id")String qrHash, HttpServletResponse response)
{ {
List<PlanInDto> list = planinservice.selectByUrl(id); List<PlanInDto> list = planinservice.selectByQRHash(qrHash);
Utils.makePlanInExcel(list, response); Utils.makePlanInExcel(list, response);

2
src/main/java/com/no1/wms/planin/PlanInMapper.java
View File

@@ -16,7 +16,7 @@ public interface PlanInMapper {
List<PlanInDto> selectById(PlanInDto dto); List<PlanInDto> selectById(PlanInDto dto);
List<PlanInDto> selectByUrl(String id); List<PlanInDto> selectByQRHash(String qrHash);
int deleteById(PlanInDto dto); int deleteById(PlanInDto dto);

4
src/main/java/com/no1/wms/planin/PlanInService.java
View File

@@ -45,9 +45,9 @@ public class PlanInService {
return mapper.delete(dto); return mapper.delete(dto);
} }
List<PlanInDto> selectByUrl(String id) { List<PlanInDto> selectByQRHash(String qrHash) {
return mapper.selectByUrl(id); return mapper.selectByQRHash(qrHash);
} }

8
src/main/resources/mappers/PlainInMapper.xml
View File

@@ -44,7 +44,7 @@
and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code
where plan.group_number = #{groupNumber} where plan.group_number = #{groupNumber}
</select> </select>
<select id="selectByUrl" resultMap="planInResultMap"> <select id="selectByQRHash" resultMap="planInResultMap">
SELECT SELECT
plan.group_number, plan.product_id, plan.quantity, plan.date, plan.manager_id, plan.group_number, plan.product_id, plan.quantity, plan.date, plan.manager_id,
plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.other, plan.activation, plan.view_group_number, plan.warehouse_id, plan.qr_hash, plan.url, plan.clear, plan.other, plan.activation, plan.view_group_number,
@@ -53,7 +53,7 @@
from plan_In plan join account acc join vendor join warehouse join product join product_category from plan_In plan join account acc join vendor join warehouse join product join product_category
on plan.product_id = product.id and product.vendor_id = vendor.id and plan.manager_id = acc.id on plan.product_id = product.id and product.vendor_id = vendor.id and plan.manager_id = acc.id
and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code and plan.warehouse_id = warehouse.id and product.kan_code = product_category.kan_code
WHERE plan.url = #{id} WHERE plan.qr_hash = #{qrHash}
</select> </select>
<select id="selectAll" resultMap="planInResultMap" parameterType="map"> <select id="selectAll" resultMap="planInResultMap" parameterType="map">
SELECT SELECT
@@ -82,8 +82,8 @@
) )
VALUES (#{groupNumber}, #{productId}, #{quantity}, VALUES (#{groupNumber}, #{productId}, #{quantity},
#{date}, #{date},
#{managerId}, #{warehouseId}, #{qrHash}, #{managerId}, #{warehouseId}, #{groupNumber},
#{groupNumber}, #{clear}, uuid(), #{clear},
#{other}, true, #{other}, true,
CASE CASE
WHEN #{viewGroupNumber} IS NOT NULL WHEN #{viewGroupNumber} IS NOT NULL