Browse Source

update

master
CANCERYS\kw093 3 weeks ago
parent
commit
fde2fe0dcc
4 changed files with 6 additions and 2 deletions
  1. +1
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
  2. +3
    -2
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt
  3. +1
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt
  4. +1
    -0
      src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt

+ 1
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt View File

@@ -97,6 +97,7 @@ data class JobOrderDetailPickLine(
val code: String?,
val name: String?,
val pickedLotNo: List<JobOrderDetailPickedLotNo>?,
val type: String?,
val reqQty: BigDecimal?,
val uom: String?,
val shortUom: String?,


+ 3
- 2
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt View File

@@ -223,8 +223,9 @@ open class JobOrderService(
status = JobOrderStatus.PENDING
}
jobOrderRepository.save(jo)

val pols = jo.jobms.map {
val pols = jo.jobms.filter { it.item?.type != "mat"&& it.item?.type != "item"}.
map {
SavePickOrderLineRequest(
itemId = it.item?.id,
qty = it.reqQty ?: BigDecimal.ZERO,


+ 1
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/entity/projections/ProductProcessInfo.kt View File

@@ -73,6 +73,7 @@ data class jobOrderLineInfo(
val itemId: Long?,
val itemCode: String?,
val itemName: String?,
val type: String?,
val reqQty: Int?,
val stockQty: Int?,
val uom: String?,


+ 1
- 0
src/main/java/com/ffii/fpsms/modules/productProcess/service/ProductProcessService.kt View File

@@ -630,6 +630,7 @@ open class ProductProcessService(
stockQty = stockQty,
uom = uom?.udfudesc ?: "",
shortUom = shortUom,
type = line.item?.type?: "",
availableStatus = availableStatus,
bomProcessId = bomProcessMaterial?.bomProcess?.id?:0,
bomProcessSeqNo = bomProcessMaterial?.bomProcess?.seqNo?:0


Loading…
Cancel
Save