jason
/
FPSMS-backend
2
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

merge fix

production
kelvin.yau 1 month ago
parent
5b61294a53
commit
c5ea9b5f05
1 changed files with 0 additions and 5 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -5
      src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt

+ 0
- 5
src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt View File

@@ -1523,11 +1523,6 @@ return MessageResponse(
dop.deliveryNoteCode = CodeGenerator.generateNo(prefix = prefix, midfix = midfix, latestCode = latestCode)
}
deliveryOrderPickOrderRepository.save(dop)
<<<<<<< HEAD

=======
>>>>>>> e9f1f48edb57d3696af3ffb23bc40d9644c8c44f
}
markDeliveryOrdersCompletedForDeliveryOrderPickOrder(deliveryOrderPickOrderId)
return MessageResponse(


Write Preview
Loading…
Cancel
Save