Просмотр исходного кода

update job edit

reset-do-picking-order
CANCERYS\kw093 3 месяцев назад
Родитель
Сommit
79d0dd6d7d
3 измененных файлов: 7 добавлений и 0 удалений
  1. +1
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
  2. +2
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt
  3. +4
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt

+ 1
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt Просмотреть файл

@@ -46,6 +46,7 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {
b.code as itemCode, b.code as itemCode,
b.name, b.name,
jo.reqQty, jo.reqQty,
jo.bomId,
b.outputQtyUom as unit, b.outputQtyUom as unit,
uc2.udfudesc as uom, uc2.udfudesc as uom,
COALESCE(uc2.udfShortDesc, uc2.udfudesc) as shortUom, COALESCE(uc2.udfShortDesc, uc2.udfudesc) as shortUom,


+ 2
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/projections/JobOrderInfo.kt Просмотреть файл

@@ -76,6 +76,7 @@ interface JobOrderDetailWithJsonString {
val code: String?; val code: String?;
val itemCode: String?; val itemCode: String?;
val name: String?; val name: String?;
val bomId: Long?;
val itemId: Long?; val itemId: Long?;
val reqQty: BigDecimal?; val reqQty: BigDecimal?;
val uom: String?; val uom: String?;
@@ -115,6 +116,7 @@ data class JobOrderDetail(
val code: String?, val code: String?,
val itemCode: String?, val itemCode: String?,
val name: String?, val name: String?,
val bomId: Long?,
val reqQty: BigDecimal?, val reqQty: BigDecimal?,
val uom: String?, val uom: String?,
val shortUom: String?, val shortUom: String?,


+ 4
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/service/JobOrderService.kt Просмотреть файл

@@ -334,6 +334,7 @@ open class JobOrderService(
name = sqlResult.name, name = sqlResult.name,
reqQty = sqlResult.reqQty, reqQty = sqlResult.reqQty,
uom = sqlResult.uom, uom = sqlResult.uom,
bomId = sqlResult.bomId,
pickLines = jsonResult, pickLines = jsonResult,
status = sqlResult.status, status = sqlResult.status,
shortUom = sqlResult.shortUom shortUom = sqlResult.shortUom
@@ -352,6 +353,7 @@ open class JobOrderService(
name = sqlResult.name, name = sqlResult.name,
reqQty = sqlResult.reqQty, reqQty = sqlResult.reqQty,
uom = sqlResult.uom, uom = sqlResult.uom,
bomId = sqlResult.bomId,
pickLines = jsonResult, pickLines = jsonResult,
status = sqlResult.status, status = sqlResult.status,
shortUom = sqlResult.shortUom shortUom = sqlResult.shortUom
@@ -371,6 +373,7 @@ open class JobOrderService(
code = sqlResult.code, code = sqlResult.code,
itemCode = sqlResult.itemCode, itemCode = sqlResult.itemCode,
name = sqlResult.name, name = sqlResult.name,
bomId = sqlResult.bomId,
reqQty = sqlResult.reqQty, reqQty = sqlResult.reqQty,
uom = sqlResult.uom, uom = sqlResult.uom,
pickLines = jsonResult, pickLines = jsonResult,
@@ -390,6 +393,7 @@ open class JobOrderService(
code = sqlResult.code, code = sqlResult.code,
itemCode = sqlResult.itemCode, itemCode = sqlResult.itemCode,
name = sqlResult.name, name = sqlResult.name,
bomId = sqlResult.bomId,
reqQty = sqlResult.reqQty, reqQty = sqlResult.reqQty,
uom = sqlResult.uom, uom = sqlResult.uom,
pickLines = jsonResult, pickLines = jsonResult,


Загрузка…
Отмена
Сохранить