Commit c212bd8ed9baca9b9f315af802ca27cfe1b96734

Authored by 房远帅
1 parent f2cf09f7

采购-入库:测试问题修改

... ... @@ -22,6 +22,9 @@ public class GetAssayReportApplyOptionBo {
22 22 @ApiModelProperty("样品名称(取自送样单)")
23 23 private String productName;
24 24
  25 + @ApiModelProperty("过磅品种类型(品种关系表代号,取自过磅明细)")
  26 + private String category;
  27 +
25 28 @ApiModelProperty("数量(自动带出过磅明细,单位公斤,不可修改)")
26 29 private BigDecimal quantity;
27 30 }
... ...
... ... @@ -22,6 +22,9 @@ public class GetAssaySelectableTicketBo {
22 22 @ApiModelProperty("供料单位名称")
23 23 private String supplierName;
24 24
  25 + @ApiModelProperty("公司简称名称")
  26 + private String companyShortName;
  27 +
25 28 @ApiModelProperty("分厂ID")
26 29 private String workshopId;
27 30
... ... @@ -34,4 +37,7 @@ public class GetAssaySelectableTicketBo {
34 37
35 38 @ApiModelProperty("创建人")
36 39 private String createBy;
  40 +
  41 + @ApiModelProperty("计划编号(多个中文逗号分隔)")
  42 + private String planCodes;
37 43 }
... ...
... ... @@ -23,6 +23,9 @@ public class GetMaterialSettleSelectableTicketBo {
23 23 @ApiModelProperty("供料单位名称")
24 24 private String supplierName;
25 25
  26 + @ApiModelProperty("公司简称名称")
  27 + private String companyShortName;
  28 +
26 29 @ApiModelProperty("分厂ID")
27 30 private String workshopId;
28 31
... ... @@ -36,6 +39,9 @@ public class GetMaterialSettleSelectableTicketBo {
36 39 @ApiModelProperty("创建人")
37 40 private String createBy;
38 41
  42 + @ApiModelProperty("计划编号(多个中文逗号分隔)")
  43 + private String planCodes;
  44 +
39 45 @ApiModelProperty("过磅明细列表")
40 46 private List<GetProcurementWeighingTicketLineBo> weighLines;
41 47
... ...
... ... @@ -65,16 +65,17 @@
65 65 tb.ckzg_name,
66 66 tb.flow_node,
67 67 tb.approval_status,
68   - <!-- 计划编号/ID集合取自过磅码单关联的计划(不可改,列表/详情展示用) -->
  68 + <!-- 计划编号/ID集合取自结算明细表关联的计划(去重,编号拼接类型后缀:正常不显示、补单"001补"、变更"001变"、变更+补单"001变补") -->
69 69 (
70   - SELECT GROUP_CONCAT(DISTINCT pwtp.plan_code ORDER BY pwtp.order_no SEPARATOR ',')
71   - FROM procurement_weighing_ticket_plan pwtp
72   - WHERE pwtp.weighing_ticket_id = tb.weighing_ticket_id
  70 + SELECT GROUP_CONCAT(DISTINCT CONCAT(pp.code, IFNULL(REPLACE(pp.plan_type, ' ', ''), '')) ORDER BY pp.code SEPARATOR ',')
  71 + FROM procurement_material_settle_line pmsl
  72 + LEFT JOIN procurement_plan pp ON pp.id = pmsl.procurement_plan_id
  73 + WHERE pmsl.settle_detail_id = tb.id
73 74 ) AS plan_codes,
74 75 (
75   - SELECT GROUP_CONCAT(DISTINCT pwtpi.procurement_plan_id SEPARATOR ',')
76   - FROM procurement_weighing_ticket_plan pwtpi
77   - WHERE pwtpi.weighing_ticket_id = tb.weighing_ticket_id
  76 + SELECT GROUP_CONCAT(DISTINCT pmsl.procurement_plan_id SEPARATOR ',')
  77 + FROM procurement_material_settle_line pmsl
  78 + WHERE pmsl.settle_detail_id = tb.id
78 79 ) AS plan_ids,
79 80 tb.deleted,
80 81 tb.create_by_id,
... ... @@ -148,6 +149,8 @@
148 149 <result column="workshop_name" property="workshopName"/>
149 150 <result column="complete_time" property="completeTime"/>
150 151 <result column="create_by" property="createBy"/>
  152 + <result column="plan_codes" property="planCodes"/>
  153 + <result column="company_short_name" property="companyShortName"/>
151 154 </resultMap>
152 155
153 156 <!-- 原料结算制单选择码单弹窗:审核通过 + 已上传签字凭证 + 码单下每个过磅品种都要有原料化验报告单且全部审核通过 + 未生成过有效原料结算详情单 -->
... ... @@ -156,10 +159,16 @@
156 159 tb.id,
157 160 tb.code,
158 161 tb.supplier_name,
  162 + tb.company_short_name,
159 163 tb.workshop_id,
160 164 tb.workshop_name,
161 165 tb.complete_time,
162   - tb.create_by
  166 + tb.create_by,
  167 + (
  168 + SELECT GROUP_CONCAT(DISTINCT pwtp.plan_code ORDER BY pwtp.order_no SEPARATOR ',')
  169 + FROM procurement_weighing_ticket_plan pwtp
  170 + WHERE pwtp.weighing_ticket_id = tb.id
  171 + ) AS plan_codes
163 172 FROM procurement_weighing_ticket AS tb
164 173 WHERE tb.deleted = 0
165 174 AND tb.approval_status = 'PASS'
... ...
... ... @@ -119,6 +119,8 @@
119 119 <result column="workshop_name" property="workshopName"/>
120 120 <result column="complete_time" property="completeTime"/>
121 121 <result column="create_by" property="createBy"/>
  122 + <result column="plan_codes" property="planCodes"/>
  123 + <result column="company_short_name" property="companyShortName"/>
122 124 </resultMap>
123 125
124 126 <!-- 化验送样选择码单弹窗:审核通过 + 已上传签字凭证(完成时间非空)+ 未作废 -->
... ... @@ -127,10 +129,16 @@
127 129 tb.id,
128 130 tb.code,
129 131 tb.supplier_name,
  132 + tb.company_short_name,
130 133 tb.workshop_id,
131 134 tb.workshop_name,
132 135 tb.complete_time,
133   - tb.create_by
  136 + tb.create_by,
  137 + (
  138 + SELECT GROUP_CONCAT(DISTINCT pwtp.plan_code ORDER BY pwtp.order_no SEPARATOR ',')
  139 + FROM procurement_weighing_ticket_plan pwtp
  140 + WHERE pwtp.weighing_ticket_id = tb.id
  141 + ) AS plan_codes
134 142 FROM procurement_weighing_ticket AS tb
135 143 WHERE tb.deleted = 0
136 144 AND tb.approval_status = 'PASS'
... ...
... ... @@ -148,6 +148,8 @@
148 148 <result column="workshop_name" property="workshopName"/>
149 149 <result column="complete_time" property="completeTime"/>
150 150 <result column="create_by" property="createBy"/>
  151 + <result column="plan_codes" property="planCodes"/>
  152 + <result column="company_short_name" property="companyShortName"/>
151 153 </resultMap>
152 154
153 155 <!-- 原料化验报告制单选择码单弹窗:审核通过 + 已上传签字凭证 + 码单下每个过磅品种都有化验送样单且全部审核通过 -->
... ... @@ -156,10 +158,16 @@
156 158 tb.id,
157 159 tb.code,
158 160 tb.supplier_name,
  161 + tb.company_short_name,
159 162 tb.workshop_id,
160 163 tb.workshop_name,
161 164 tb.complete_time,
162   - tb.create_by
  165 + tb.create_by,
  166 + (
  167 + SELECT GROUP_CONCAT(DISTINCT pwtp.plan_code ORDER BY pwtp.order_no SEPARATOR ',')
  168 + FROM procurement_weighing_ticket_plan pwtp
  169 + WHERE pwtp.weighing_ticket_id = tb.id
  170 + ) AS plan_codes
163 171 FROM procurement_weighing_ticket AS tb
164 172 WHERE tb.deleted = 0
165 173 AND tb.approval_status = 'PASS'
... ... @@ -245,6 +253,7 @@
245 253 <result column="assay_apply_code" property="assayApplyCode"/>
246 254 <result column="product_id" property="productId"/>
247 255 <result column="product_name" property="productName"/>
  256 + <result column="category" property="category"/>
248 257 <result column="quantity" property="quantity"/>
249 258 </resultMap>
250 259
... ... @@ -262,7 +271,12 @@
262 271 AND pwtl.quantity IS NOT NULL
263 272 ORDER BY pwtl.order_no
264 273 LIMIT 1
265   - ) AS quantity
  274 + ) AS quantity,
  275 + (
  276 + SELECT br.code
  277 + FROM base_data_breed_relationship br
  278 + WHERE br.id = aa.product_id
  279 + ) AS category
266 280 FROM procurement_assay_apply aa
267 281 WHERE aa.weighing_ticket_id = #{ticketId}
268 282 AND aa.procurement_plan_id = #{planId}
... ...