Merge remote-tracking branch 'origin/master'

7 months ago · 4fdc46293b
parent 8a22118ac2 78b65211b6
commit 4fdc46293b
1 changed files with 1 additions and 1 deletions
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@ -688,7 +688,7 @@
               case when powbp.quantity is not null then powbp.quantity
               else powb.batch_quantity end batchQuantity,
               bpa.pallet_num palletNum,
-               concat(pow.workorder_code_sap,'-', powb.batch_code) palletCode,
+               concat(pow.workorder_code_sap,'-', powb.batch_code,'-',powbp.pallet_num) palletCode,
               powbp.pallet_num palletNo
        from pro_order_workorder pow
        left join pro_order_workorder_batch powb on pow.workorder_id = powb.workorder_id