Merge branch 'master' of http://119.3.29.177:3000/xusc/ICSMESBase

src/vue/src/shared/service-proxies/service-proxies.ts

@@ -46889,12 +46889,15 @@ export class IcsSanJBarCodeServiceProxy {
 
     /**
      * @param barCodeNo (optional) 
+     * @param doType (optional) 
      * @return Success
      */
-    getBarCodeData(barCodeNo: string | null | undefined , cancelToken?: CancelToken | undefined): Promise<IcsSanJBarCodeListDto> {
+    getBarCodeData(barCodeNo: string | null | undefined, doType: string | null | undefined , cancelToken?: CancelToken | undefined): Promise<IcsSanJBarCodeListDto> {
         let url_ = this.baseUrl + "/api/services/app/IcsSanJBarCode/GetBarCodeData?";
         if (barCodeNo !== undefined && barCodeNo !== null)
             url_ += "barCodeNo=" + encodeURIComponent("" + barCodeNo) + "&";
+        if (doType !== undefined && doType !== null)
+            url_ += "doType=" + encodeURIComponent("" + doType) + "&";
         url_ = url_.replace(/[?&]$/, "");
 
         let options_: AxiosRequestConfig = {
@@ -124751,6 +124754,8 @@ export class IcsSanJBarCodeListDto implements IIcsSanJBarCodeListDto {
     printTimes: number;
     lastPrintUserCode: string | undefined;
     lastPrintDate: moment.Moment | undefined;
+    lastToOutBarCode: string | undefined;
+    lastToOutBar_ProductDate: moment.Moment | undefined;
     creatorUserName: string | undefined;
     lastModifierUserName: string | undefined;
     lastModificationTime: moment.Moment | undefined;
@@ -124791,6 +124796,8 @@ export class IcsSanJBarCodeListDto implements IIcsSanJBarCodeListDto {
             this.printTimes = _data["printTimes"];
             this.lastPrintUserCode = _data["lastPrintUserCode"];
             this.lastPrintDate = _data["lastPrintDate"] ? moment(_data["lastPrintDate"].toString()) : <any>undefined;
+            this.lastToOutBarCode = _data["lastToOutBarCode"];
+            this.lastToOutBar_ProductDate = _data["lastToOutBar_ProductDate"] ? moment(_data["lastToOutBar_ProductDate"].toString()) : <any>undefined;
             this.creatorUserName = _data["creatorUserName"];
             this.lastModifierUserName = _data["lastModifierUserName"];
             this.lastModificationTime = _data["lastModificationTime"] ? moment(_data["lastModificationTime"].toString()) : <any>undefined;
@@ -124831,6 +124838,8 @@ export class IcsSanJBarCodeListDto implements IIcsSanJBarCodeListDto {
         data["printTimes"] = this.printTimes;
         data["lastPrintUserCode"] = this.lastPrintUserCode;
         data["lastPrintDate"] = this.lastPrintDate ? this.lastPrintDate.toISOString() : <any>undefined;
+        data["lastToOutBarCode"] = this.lastToOutBarCode;
+        data["lastToOutBar_ProductDate"] = this.lastToOutBar_ProductDate ? this.lastToOutBar_ProductDate.toISOString() : <any>undefined;
         data["creatorUserName"] = this.creatorUserName;
         data["lastModifierUserName"] = this.lastModifierUserName;
         data["lastModificationTime"] = this.lastModificationTime ? this.lastModificationTime.toISOString() : <any>undefined;
@@ -124871,6 +124880,8 @@ export interface IIcsSanJBarCodeListDto {
     printTimes: number;
     lastPrintUserCode: string | undefined;
     lastPrintDate: moment.Moment | undefined;
+    lastToOutBarCode: string | undefined;
+    lastToOutBar_ProductDate: moment.Moment | undefined;
     creatorUserName: string | undefined;
     lastModifierUserName: string | undefined;
     lastModificationTime: moment.Moment | undefined;