@things-factory/worksheet-base 4.3.258 → 4.3.262

package/server/graphql/resolvers/worksheet/vas/edit-vas.ts

@@ -0,0 +1,25 @@
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { EntityManager } from 'typeorm'
+import { VasWorksheetController } from '../../../../controllers'
+import { WorksheetDetail } from '../../../../entities'
+import { OrderVasPatch, OrderVasItemPatch } from '@things-factory/sales-base'
+
+export const editVasResolver = {
+  async editVas(_: any, { orderVasPatch, orderVasItemPatch, orderNo }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    return await editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo)
+  }
+}
+
+export async function editVas(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  orderVasPatch: OrderVasPatch[],
+  orderVasItemPatch: OrderVasItemPatch[],
+  orderNo: string
+) {
+  const worksheetController: VasWorksheetController = new VasWorksheetController(tx, domain, user)
+  return await worksheetController.editVas(tx, domain, user, orderVasPatch, orderVasItemPatch, orderNo)
+}

package/server/graphql/resolvers/worksheet/vas/index.ts

@@ -3,6 +3,7 @@ import { activateVasResolver } from './activate-vas'
 import { executeVasResolver } from './execute-vas'
 import { undoVasResolver } from './undo-vas'
 import { completeVasResolver } from './complete-vas'
+import { editVasResolver } from './edit-vas'
 import { undoVasInventoryResolver } from './undo-vas-inventory'
 
 export const Mutations = {
@@ -11,5 +12,6 @@ export const Mutations = {
   ...executeVasResolver,
   ...undoVasResolver,
   ...completeVasResolver,
+  ...editVasResolver,
   ...undoVasInventoryResolver
 }

package/server/graphql/resolvers/worksheet-detail/generate-pallet-id.ts

@@ -27,8 +27,10 @@ export const generatePalletIdResolver = {
         'targetProduct.arrivalNotice',
         'targetProduct.arrivalNotice.purchaseOrder',
         'targetProduct.product',
+        'targetProduct.productDetail',
         'targetInventory',
         'targetInventory.product',
+        'targetInventory.productDetail',
         'targetVas',
         'targetVas.targetProduct'
       ]
@@ -52,7 +54,9 @@ export const generatePalletIdResolver = {
                   orderProductRemark: foundWSD.targetProduct.remark,
                   purchaseOrderNo: foundWSD.targetProduct.arrivalNotice?.purchaseOrder?.name || '',
                   arrivalNoticeRefNo: foundWSD.targetProduct.arrivalNotice?.refNo || '',
-                  arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || ''
+                  arrivalNoticeNo: foundWSD.targetProduct.arrivalNotice?.name || '',
+                  uomValue: foundWSD.targetProduct.uomValue,
+                  uom: foundWSD.targetProduct.uom
                 }
               } else if (foundWSD.targetInventory) {
                 result = {

package/server/graphql/types/worksheet/index.ts

@@ -506,6 +506,12 @@ export const Mutation = /* GraphQL */ `
     worksheetDetails: [WorksheetDetailPatch]
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  editVas (
+    orderVasPatch: [OrderVasPatch]
+    orderVasItemPatch: [OrderVasItemPatch]
+    orderNo: String
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   repalletizing (
     worksheetDetailName: String!
     fromPalletId: String!

package/server/utils/lmd-util.ts

@@ -57,11 +57,11 @@ export async function createLmdParcel(releaseGoods, tx) {
 
         pAddress: bizplace.address,
         pAddress2: bizplace.address2,
-        pCity: senderGeoArea.cityName,
-        pPostcode: senderGeoArea.postalCode,
-        pDistrict: senderGeoArea.cityName,
-        pState: senderGeoArea.stateName,
-        pCountry: senderGeoArea.countryCode,
+        pCity: bizplace.city || senderGeoArea.cityName,
+        pPostcode: bizplace.postalCode ||senderGeoArea.postalCode,
+        pDistrict: bizplace.city || senderGeoArea.cityName,
+        pState: bizplace.state ||senderGeoArea.stateName,
+        pCountry: bizplace.countryCode || senderGeoArea.countryCode,
 
         handoverMethod: 1
       }