@things-factory/sales-base 4.0.0-y.0 → 4.0.4

package/dist-server/entities/release-good.js.map

@@ -1 +1 @@
-{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../server/entities/release-good.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,6CAA4C;AAC5C,uDAAiE;AACjE,iDAA8C;AAC9C,qCAWgB;AAChB,0CAAiH;AAEjH,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;AAEpC,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,+BAAW,CAAA;AACb,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAGD,IAAa,WAAW,GAAxB,MAAa,WAAW;CA2KvB,CAAA;AAzKC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;uCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;2CAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,CAAC;kDAClB,mBAAQ,oBAAR,mBAAQ;6CAAA;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACF;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAYf;IAVC,IAAA,gBAAM,EAAC;QACN,IAAI,EACF,aAAa,IAAI,UAAU,IAAI,aAAa,IAAI,OAAO,IAAI,aAAa,IAAI,SAAS;YACnF,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,aAAa,IAAI,QAAQ;gBAC3B,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,UAAU;QAChB,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,gBAAgB,CAAC,GAAG;KAC9B,CAAC;;yCACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACb,OAAO;iDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACZ,OAAO;kDAAA;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACZ,OAAO;kDAAA;AAGtB;IADC,IAAA,gBAAM,GAAE;8BACK,OAAO;iDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACb,OAAO;iDAAA;AAGrB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,wBAAa;kDAAA;AAG5B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;;mDAC9C;AAI/B;IAFC,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,CAAC;IAC/B,IAAA,oBAAU,GAAE;8BACE,wBAAa;kDAAA;AAG5B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;;8CACzC;AAGrB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAc,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;;qDAC9C;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;;kDAC7C;AAG7B;IADC,IAAA,gBAAM,GAAE;;2CACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACV,IAAI;oDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACpB,MAAM;0CAAA;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnB,MAAM;2CAAA;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnB,MAAM;2CAAA;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACG;AAG9B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACL;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;8CAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;8CAAA;AAGf;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAChC,gBAAI,oBAAJ,gBAAI;+CAAA;AAKhB;IAHC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;8BACU,IAAI;+CAAA;AAGhB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACzC,uBAAY,oBAAZ,uBAAY;8CAAA;AAGvB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;4CAAA;AAGb;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;4CAAA;AA1KF,WAAW;IAFvB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,mBAAmB,EAAE,CAAC,WAAwB,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACtG,WAAW,CA2KvB;AA3KY,kCAAW"}
+{"version":3,"file":"release-good.js","sourceRoot":"","sources":["../../server/entities/release-good.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAWgB;AAEhB,yDAAgD;AAChD,uDAAiE;AACjE,6CAA4C;AAC5C,iDAA8C;AAE9C,0CAAiH;AAEjH,MAAM,SAAS,GAAG,YAAM,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;AAC7C,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAA;AAEpC,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IAC1B,+BAAW,CAAA;IACX,+BAAW,CAAA;AACb,CAAC,EAHW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAG3B;AAGD,IAAa,WAAW,GAAxB,MAAa,WAAW;CA0LvB,CAAA;AAxLC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;uCACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;2CAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,CAAC;kDAClB,mBAAQ,oBAAR,mBAAQ;6CAAA;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sDACF;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAYf;IAVC,IAAA,gBAAM,EAAC;QACN,IAAI,EACF,aAAa,IAAI,UAAU,IAAI,aAAa,IAAI,OAAO,IAAI,aAAa,IAAI,SAAS;YACnF,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,aAAa,IAAI,QAAQ;gBAC3B,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC,UAAU;QAChB,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,gBAAgB,CAAC,GAAG;KAC9B,CAAC;;yCACoB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACb,OAAO;iDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACZ,OAAO;kDAAA;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACZ,OAAO;kDAAA;AAGtB;IADC,IAAA,gBAAM,GAAE;8BACK,OAAO;iDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;8BACb,OAAO;iDAAA;AAGrB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,wBAAa;kDAAA;AAG5B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC;;mDAC9C;AAI/B;IAFC,IAAA,kBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,CAAC;IAC/B,IAAA,oBAAU,GAAE;8BACE,wBAAa;kDAAA;AAG5B;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC;;8CACzC;AAGrB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,yBAAc,EAAE,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,WAAW,CAAC;;qDAC9C;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC;;kDAC7C;AAG7B;IADC,IAAA,gBAAM,GAAE;;2CACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACV,IAAI;oDAAA;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACpB,MAAM;0CAAA;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnB,MAAM;2CAAA;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnB,MAAM;2CAAA;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACG;AAG9B;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACL;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;+CAAA;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACP;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACL;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACd;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACV;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACZ;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;8CAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;8CAAA;AAGf;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDAChC,gBAAI,oBAAJ,gBAAI;+CAAA;AAKhB;IAHC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;8BACU,IAAI;+CAAA;AAGhB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACzC,uBAAY,oBAAZ,uBAAY;8CAAA;AAGvB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;4CAAA;AAGb;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACnC,gBAAI,oBAAJ,gBAAI;4CAAA;AAzLF,WAAW;IAFvB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,mBAAmB,EAAE,CAAC,WAAwB,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACtG,WAAW,CA0LvB;AA1LY,kCAAW"}

package/dist-server/entities/reverse-kitting-order.js

@@ -0,0 +1,82 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var _a, _b, _c, _d;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ReverseKittingOrder = void 0;
+const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const biz_base_1 = require("@things-factory/biz-base");
+const shell_1 = require("@things-factory/shell");
+const order_reverse_kitting_1 = require("./order-reverse-kitting");
+let ReverseKittingOrder = class ReverseKittingOrder {
+};
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)('uuid'),
+    __metadata("design:type", String)
+], ReverseKittingOrder.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
+    __metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+], ReverseKittingOrder.prototype, "domain", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => biz_base_1.Bizplace),
+    __metadata("design:type", typeof (_b = typeof biz_base_1.Bizplace !== "undefined" && biz_base_1.Bizplace) === "function" ? _b : Object)
+], ReverseKittingOrder.prototype, "bizplace", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], ReverseKittingOrder.prototype, "name", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    __metadata("design:type", String)
+], ReverseKittingOrder.prototype, "description", void 0);
+__decorate([
+    (0, typeorm_1.OneToMany)(type => order_reverse_kitting_1.OrderReverseKitting, orderReverseKitting => orderReverseKitting.reverseKittingOrder),
+    __metadata("design:type", Array)
+], ReverseKittingOrder.prototype, "orderReverseKittings", void 0);
+__decorate([
+    (0, typeorm_1.Column)({
+        nullable: true
+    }),
+    __metadata("design:type", String)
+], ReverseKittingOrder.prototype, "remark", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], ReverseKittingOrder.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], ReverseKittingOrder.prototype, "createdAt", void 0);
+__decorate([
+    (0, typeorm_1.UpdateDateColumn)(),
+    __metadata("design:type", Date)
+], ReverseKittingOrder.prototype, "updatedAt", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
+        nullable: true
+    }),
+    __metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+], ReverseKittingOrder.prototype, "creator", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
+        nullable: true
+    }),
+    __metadata("design:type", typeof (_d = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _d : Object)
+], ReverseKittingOrder.prototype, "updater", void 0);
+ReverseKittingOrder = __decorate([
+    (0, typeorm_1.Entity)(),
+    (0, typeorm_1.Index)('ix_reverse-kitting-order_0', (reverseKittingOrder) => [reverseKittingOrder.domain, reverseKittingOrder.name], { unique: true })
+], ReverseKittingOrder);
+exports.ReverseKittingOrder = ReverseKittingOrder;
+//# sourceMappingURL=reverse-kitting-order.js.map

package/dist-server/entities/reverse-kitting-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reverse-kitting-order.js","sourceRoot":"","sources":["../../server/entities/reverse-kitting-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,uDAAmD;AACnD,iDAA8C;AAE9C,mEAA6D;AAQ7D,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;CA4C/B,CAAA;AA1CC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;+CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;mDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,mBAAQ,CAAC;kDAClB,mBAAQ,oBAAR,mBAAQ;qDAAA;AAGlB;IADC,IAAA,gBAAM,GAAE;;iDACG;AAKZ;IAHC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;;wDACiB;AAGnB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2CAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;;iEAC5D;AAK3C;IAHC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;8BACM,MAAM;mDAAA;AAGd;IADC,IAAA,gBAAM,GAAE;;mDACK;AAGd;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;sDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;sDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;oDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;oDAAA;AA3CF,mBAAmB;IAN/B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,4BAA4B,EAC5B,CAAC,mBAAwC,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,CAAC,EACpG,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,mBAAmB,CA4C/B;AA5CY,kDAAmB"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticeRequestsResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeRequestsResolver = {
@@ -28,23 +28,46 @@ exports.arrivalNoticeRequestsResolver = {
                     relation: false
                 });
             }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
+                    relation: false
+                });
+            }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    relation: false
+                });
+            }
             const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
             (0, shell_1.buildQuery)(qb, params, context);
-            qb.addSelect(subQuery => {
-                return subQuery
-                    .select('COALESCE("ccd".rank, 99999)', 'rank')
-                    .from('common_code_details', 'ccd')
-                    .innerJoin('ccd.commonCode', 'cc')
-                    .where('"ccd"."name" = "an"."status"')
-                    .andWhere('"ccd"."domain_id" = "an"."domain_id"')
-                    .andWhere('"cc"."name" = \'ORDER_STATUS\'');
-            }, 'rank');
+            qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
             qb.leftJoinAndSelect('an.domain', 'domain');
             qb.leftJoinAndSelect('an.bizplace', 'bizplace');
-            qb.leftJoinAndSelect('an.releaseGood', 'rg');
+            qb.leftJoinAndSelect('an.releaseGood', 'ro');
             qb.leftJoinAndSelect('an.creator', 'creator');
             qb.leftJoinAndSelect('an.updater', 'updater');
-            qb.leftJoinAndSelect('an.acceptedBy', 'acceptedBy');
+            qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'ORDER_STATUS'`);
+            }, 'cc', 'cc.status = an.status');
             const arrChildSortData = ['bizplace'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc
                     ? 'DESC'

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice-requests.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arrival-notice-requests.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice-requests.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js

@@ -1,23 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticeResolver = void 0;
+const typeorm_1 = require("typeorm");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const biz_base_1 = require("@things-factory/biz-base");
-const typeorm_1 = require("typeorm");
 const attachment_type_1 = require("../../../constants/attachment-type");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticeResolver = {
-    async arrivalNotice(_, { name }, context) {
-        var _a, _b;
+    async arrivalNotice(_, { name, refNo }, context) {
+        var _a, _b, _c;
         const { domain, user, bizplace } = context.state;
         let foundGAN;
         if ((_a = context === null || context === void 0 ? void 0 : context.state) === null || _a === void 0 ? void 0 : _a.bizplace) {
+            let param;
+            if (name)
+                param = { domain, name, bizplace };
+            else
+                param = { domain, refNo, bizplace };
             foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
-                where: {
-                    domain,
-                    name,
-                    bizplace
-                },
+                where: Object.assign({}, param),
                 relations: [
                     'domain',
                     'bizplace',
@@ -26,6 +27,10 @@ exports.arrivalNoticeResolver = {
                     'purchaseOrder.bufferLocation',
                     'orderProducts',
                     'orderProducts.product',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.product',
+                    'orderInventories.inventory.location',
                     'orderVass',
                     'orderVass.vas',
                     'orderVass.targetProduct',
@@ -36,12 +41,13 @@ exports.arrivalNoticeResolver = {
             });
         }
         else {
+            let param;
+            if (name)
+                param = { domain, name, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
+            else
+                param = { domain, refNo, bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user)) };
             foundGAN = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findOne({
-                where: {
-                    domain,
-                    name,
-                    bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user))
-                },
+                where: Object.assign({}, param),
                 relations: [
                     'domain',
                     'bizplace',
@@ -50,6 +56,10 @@ exports.arrivalNoticeResolver = {
                     'purchaseOrder.bufferLocation',
                     'orderProducts',
                     'orderProducts.product',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.product',
+                    'orderInventories.inventory.location',
                     'orderVass',
                     'orderVass.vas',
                     'orderVass.targetProduct',
@@ -58,22 +68,24 @@ exports.arrivalNoticeResolver = {
                 ]
             });
         }
-        if (!(foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.id))
+        if (name && !foundGAN)
             throw new Error(`Failed to find arrival notice with ${name}`);
         const foundAttachments = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
             where: {
                 domain,
-                refBy: foundGAN.id,
+                refBy: foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.id,
                 category: attachment_type_1.ATTACHMENT_TYPE.GAN
             }
         });
-        const foundPOAttachments = ((_b = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id) ? await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
-            where: {
-                domain,
-                refBy: foundGAN.purchaseOrder.id,
-                category: attachment_type_1.ATTACHMENT_TYPE.PO
-            }
-        }) : [];
+        const foundPOAttachments = ((_b = foundGAN === null || foundGAN === void 0 ? void 0 : foundGAN.purchaseOrder) === null || _b === void 0 ? void 0 : _b.id)
+            ? await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
+                where: {
+                    domain,
+                    refBy: (_c = foundGAN.purchaseOrder) === null || _c === void 0 ? void 0 : _c.id,
+                    category: attachment_type_1.ATTACHMENT_TYPE.PO
+                }
+            })
+            : [];
         return Object.assign(Object.assign({}, foundGAN), { attachment: [...foundPOAttachments, ...foundAttachments] });
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notice.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qEAA4D;AAE5D,uDAA4E;AAE5E,qCAA2C;AAC3C,wEAAoE;AACpE,gDAAiD;AAEpC,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;;QAChD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAuD,OAAO,CAAC,KAAK,CAAA;QAEpG,IAAI,QAAuB,CAAA;QAE3B,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,EAAE;YAC5B,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE;oBACL,MAAM;oBACN,IAAI;oBACJ,QAAQ;iBACT;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,UAAU;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;aAAM;YACL,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,EAAE;oBACL,MAAM;oBACN,IAAI;oBACJ,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC;iBAC1D;gBACD,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;QAED,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE,CAAA;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;QAEhF,MAAM,gBAAgB,GAAiB,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YAC1E,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,CAAC,EAAE;gBAClB,QAAQ,EAAE,iCAAe,CAAC,GAAG;aAC9B;SACF,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAiB,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,0CAAE,EAAE,EAAC,CAAC,CAAC,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YACxG,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,EAAE;gBAChC,QAAQ,EAAE,iCAAe,CAAC,EAAE;aAC7B;SACF,CAAC,CAAA,CAAC,CAAC,EAAE,CAAA;QAGR,uCACK,QAAQ,KACX,UAAU,EAAE,CAAC,GAAG,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,IACzD;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"arrival-notice.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notice.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAE3C,qEAA4D;AAE5D,uDAA4E;AAG5E,wEAAoE;AACpE,gDAAiD;AAEpC,QAAA,qBAAqB,GAAG;IACnC,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAY;;QACvD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAuD,OAAO,CAAC,KAAK,CAAA;QAEpG,IAAI,QAAuB,CAAA;QAE3B,IAAI,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,QAAQ,EAAE;YAC5B,IAAI,KAAU,CAAA;YAEd,IAAI,IAAI;gBAAE,KAAK,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;;gBACvC,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAA;YAExC,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,oBAAO,KAAK,CAAE;gBACnB,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,kBAAkB;oBAClB,4BAA4B;oBAC5B,oCAAoC;oBACpC,qCAAqC;oBACrC,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,UAAU;oBACV,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;aAAM;YACL,IAAI,KAAU,CAAA;YAEd,IAAI,IAAI;gBAAE,KAAK,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAA;;gBACxF,KAAK,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAA;YAEzF,QAAQ,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,OAAO,CAAC;gBACpD,KAAK,oBAAO,KAAK,CAAE;gBACnB,SAAS,EAAE;oBACT,QAAQ;oBACR,UAAU;oBACV,aAAa;oBACb,eAAe;oBACf,8BAA8B;oBAC9B,eAAe;oBACf,uBAAuB;oBACvB,kBAAkB;oBAClB,4BAA4B;oBAC5B,oCAAoC;oBACpC,qCAAqC;oBACrC,WAAW;oBACX,eAAe;oBACf,yBAAyB;oBACzB,SAAS;oBACT,SAAS;iBACV;aACF,CAAC,CAAA;SACH;QAED,IAAI,IAAI,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,sCAAsC,IAAI,EAAE,CAAC,CAAA;QAEpF,MAAM,gBAAgB,GAAiB,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;YAC1E,KAAK,EAAE;gBACL,MAAM;gBACN,KAAK,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,EAAE;gBACnB,QAAQ,EAAE,iCAAe,CAAC,GAAG;aAC9B;SACF,CAAC,CAAA;QAEF,MAAM,kBAAkB,GAAiB,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa,0CAAE,EAAE;YAClE,CAAC,CAAC,MAAM,IAAA,uBAAa,EAAC,4BAAU,CAAC,CAAC,IAAI,CAAC;gBACnC,KAAK,EAAE;oBACL,MAAM;oBACN,KAAK,EAAE,MAAA,QAAQ,CAAC,aAAa,0CAAE,EAAE;oBACjC,QAAQ,EAAE,iCAAe,CAAC,EAAE;iBAC7B;aACF,CAAC;YACJ,CAAC,CAAC,EAAE,CAAA;QAEN,uCACK,QAAQ,KACX,UAAU,EAAE,CAAC,GAAG,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,IACzD;IACH,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js

@@ -1,19 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arrivalNoticesResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../../../entities");
 exports.arrivalNoticesResolver = {
     async arrivalNotices(_, params, context) {
         const { domain, user } = context.state;
-        const convertedParams = (0, shell_1.convertListParams)(params);
         if (!params.filters.find((filter) => filter.name === 'bizplace')) {
-            convertedParams.where.bizplace = (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user));
-            convertedParams.where.domain = domain;
+            params.filters.push({
+                name: 'bizplaceId',
+                operator: 'in',
+                value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                relation: false
+            });
+        }
+        const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+        if (fromDateParamIdx >= 0) {
+            let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+            params.filters.splice(fromDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'gte',
+                value: fromDateVal.toISOString(),
+                relation: false
+            });
+        }
+        const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+        if (toDateParamIdx >= 0) {
+            let toDateVal = new Date(params.filters[toDateParamIdx].value);
+            params.filters.splice(toDateParamIdx, 1);
+            params.filters.push({
+                name: 'createdAt',
+                operator: 'lt',
+                value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                relation: false
+            });
         }
-        const [items, total] = await (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'creator', 'updater', 'acceptedBy'] }));
+        const qb = (0, typeorm_1.getRepository)(entities_1.ArrivalNotice).createQueryBuilder('an');
+        (0, shell_1.buildQuery)(qb, params, context);
+        qb.addSelect('COALESCE("cc".rank, 9999)', 'rank');
+        qb.leftJoinAndSelect('an.domain', 'domain');
+        qb.leftJoinAndSelect('an.bizplace', 'bizplace');
+        qb.leftJoinAndSelect('an.releaseGood', 'ro');
+        qb.leftJoinAndSelect('an.creator', 'creator');
+        qb.leftJoinAndSelect('an.updater', 'updater');
+        qb.leftJoinAndSelect('an.acceptedBy', 'accepter');
+        qb.leftJoin(subQuery => {
+            return subQuery
+                .select(`ccd.rank`, 'rank')
+                .addSelect(`ccd.name`, 'status')
+                .from(`common_code_details`, 'ccd')
+                .innerJoin(`ccd.commonCode`, 'cc')
+                .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                .andWhere(`cc.name = 'ORDER_STATUS'`);
+        }, 'cc', 'cc.status = an.status');
+        const arrChildSortData = ['bizplace'];
+        const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'an.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
+        qb.orderBy(sort);
+        const [items, total] = await qb.getManyAndCount();
         return { items, total };
     }
 };

package/dist-server/graphql/resolvers/arrival-notice/arrival-notices.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":";;;AACA,uDAAkE;AAClE,iDAA4E;AAC5E,qCAA2C;AAC3C,gDAAiD;AAEpC,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC1D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAmC,OAAO,CAAC,KAAK,CAAA;QAEtE,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QAEjD,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;YACrE,eAAe,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAA,YAAE,EAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;YAChF,eAAe,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAA;SACtC;QAED,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,wBAAa,CAAC,CAAC,YAAY,iCACjE,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC,IAClH,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
+{"version":3,"file":"arrival-notices.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/arrival-notice/arrival-notices.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js

@@ -1,64 +1,101 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deliveryOrdersResolver = void 0;
+const typeorm_1 = require("typeorm");
 const biz_base_1 = require("@things-factory/biz-base");
 const shell_1 = require("@things-factory/shell");
-const typeorm_1 = require("typeorm");
 const entities_1 = require("../../../entities");
+const debug = require('debug')('things-factory:sales-base:delivery-orders');
 exports.deliveryOrdersResolver = {
     async deliveryOrders(_, params, context) {
-        const { domain, user } = context.state;
-        const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
-        if (!bizplaceFilter) {
-            params.filters.push({
-                name: 'bizplaceId',
-                operator: 'in',
-                value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
-                relation: false
-            });
-        }
-        const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo');
-        if (releaseGoodParam) {
-            let arrFilters = [];
-            params.filters.splice(params.filters.findIndex(item => item.name == 'releaseGoodNo'), 1);
-            arrFilters.push(Object.assign(Object.assign({}, releaseGoodParam), { name: 'name' }));
-            const foundReleaseGoods = await (0, typeorm_1.getRepository)(entities_1.ReleaseGood).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: arrFilters })));
-            if (foundReleaseGoods && foundReleaseGoods.length) {
+        try {
+            const { domain, user } = context.state;
+            const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
+            if (!bizplaceFilter) {
                 params.filters.push({
-                    name: 'releaseGoodId',
+                    name: 'bizplaceId',
                     operator: 'in',
-                    value: foundReleaseGoods.map((releaseGood) => releaseGood.id),
+                    value: await (0, biz_base_1.getPermittedBizplaceIds)(domain, user),
+                    relation: false
+                });
+            }
+            const releaseGoodParam = params.filters.find(param => param.name === 'releaseGoodNo');
+            if (releaseGoodParam) {
+                let arrFilters = [];
+                params.filters.splice(params.filters.findIndex(item => item.name == 'releaseGoodNo'), 1);
+                arrFilters.push(Object.assign(Object.assign({}, releaseGoodParam), { name: 'name' }));
+                const foundReleaseGoods = await (0, typeorm_1.getRepository)(entities_1.ReleaseGood).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: arrFilters })));
+                if (foundReleaseGoods && foundReleaseGoods.length) {
+                    params.filters.push({
+                        name: 'releaseGoodId',
+                        operator: 'in',
+                        value: foundReleaseGoods.map((releaseGood) => releaseGood.id),
+                        relation: false
+                    });
+                }
+            }
+            const tzOffsetIdx = params.filters.findIndex(param => param.name === 'tzoffset');
+            let tzOffset = 0;
+            if (tzOffsetIdx >= 0) {
+                tzOffset = params.filters[tzOffsetIdx].value;
+                params.filters.splice(tzOffsetIdx, 1);
+            }
+            const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
+            if (fromDateParamIdx >= 0) {
+                let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                params.filters.splice(fromDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'gte',
+                    value: fromDateVal.toISOString(),
                     relation: false
                 });
             }
+            const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
+            if (toDateParamIdx >= 0) {
+                let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                params.filters.splice(toDateParamIdx, 1);
+                params.filters.push({
+                    name: 'createdAt',
+                    operator: 'lt',
+                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    relation: false
+                });
+            }
+            const qb = (0, typeorm_1.getRepository)(entities_1.DeliveryOrder).createQueryBuilder('do');
+            (0, shell_1.buildQuery)(qb, params, context);
+            qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
+            qb.leftJoinAndSelect('do.domain', 'domain');
+            qb.leftJoinAndSelect('do.bizplace', 'bizplace');
+            qb.leftJoinAndSelect('do.releaseGood', 'rg');
+            qb.leftJoinAndSelect('do.transportDriver', 'td');
+            qb.leftJoinAndSelect('do.transportVehicle', 'th');
+            qb.leftJoinAndSelect('do.orderInventories', 'oi');
+            qb.leftJoinAndSelect('oi.inventory', 'inv');
+            qb.leftJoinAndSelect('inv.product', 'prd');
+            qb.leftJoinAndSelect('do.creator', 'creator');
+            qb.leftJoinAndSelect('do.updater', 'updater');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'DELIVERY_STATUS'`);
+            }, 'cc', 'cc.status = do.status');
+            const arrChildSortData = ['bizplace', 'releaseGood'];
+            const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'do.' + sort.name]: sort.desc
+                    ? 'DESC'
+                    : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
+            qb.orderBy(sort);
+            const [items, total] = await qb.getManyAndCount();
+            return { items, total };
+        }
+        catch (error) {
+            debug('deliveryOrders', error.toString());
+            throw error;
         }
-        const qb = (0, typeorm_1.getRepository)(entities_1.DeliveryOrder).createQueryBuilder('do');
-        (0, shell_1.buildQuery)(qb, params, context);
-        qb.addSelect(subQuery => {
-            return subQuery
-                .select('COALESCE("ccd".rank, 99999)', 'rank')
-                .from('common_code_details', 'ccd')
-                .innerJoin('ccd.commonCode', 'cc')
-                .where('"ccd"."name" = "do"."status"')
-                .andWhere('"ccd"."domain_id" = "do"."domain_id"')
-                .andWhere('"cc"."name" = \'DELIVERY_STATUS\'');
-        }, 'rank');
-        qb.leftJoinAndSelect('do.domain', 'domain');
-        qb.leftJoinAndSelect('do.bizplace', 'bizplace');
-        qb.leftJoinAndSelect('do.releaseGood', 'rg');
-        qb.leftJoinAndSelect('do.orderInventories', 'oi');
-        qb.leftJoinAndSelect('oi.inventory', 'inv');
-        qb.leftJoinAndSelect('inv.product', 'prdc');
-        qb.leftJoinAndSelect('inv.reusablePallet', 'plt');
-        qb.leftJoinAndSelect('do.transportDriver', 'td');
-        qb.leftJoinAndSelect('do.transportVehicle', 'th');
-        qb.leftJoinAndSelect('do.creator', 'creator');
-        qb.leftJoinAndSelect('do.updater', 'updater');
-        const arrChildSortData = ['bizplace', 'releaseGood'];
-        const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'do.' + sort.name]: sort.desc ? 'DESC' : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
-        qb.orderBy(sort);
-        const [items, total] = await qb.getManyAndCount();
-        return { items, total };
     }
 };
 //# sourceMappingURL=delivery-orders.js.map

package/dist-server/graphql/resolvers/delivery-order/delivery-orders.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delivery-orders.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/delivery-order/delivery-orders.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/delivery-order/dispatch-delivery-order.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dispatchDeliveryOrder = void 0;
-const constants_1 = require("../../../constants");
-const entities_1 = require("../../../entities");
 const biz_base_1 = require("@things-factory/biz-base");
 const transport_base_1 = require("@things-factory/transport-base");
+const constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
 exports.dispatchDeliveryOrder = {
     async dispatchDeliveryOrder(_, { orderInfo, orderItems }, context) {
         try {
@@ -28,8 +28,10 @@ exports.dispatchDeliveryOrder = {
                 const product = inventory.product;
                 const foundItem = inventory.reusablePallet
                     ? orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
+                        item.batchId === orderInventory.batchId &&
                         item.pallet === inventory.reusablePallet.name)
-                    : orderItems.filter((item) => item.productName === `${product.name} (${product.description})`);
+                    : orderItems.filter((item) => item.productName === `${product.name} (${product.description})` &&
+                        item.batchId === orderInventory.batchId);
                 if (foundItem[0].remark !== '')
                     orderInventory.remark = foundItem[0].remark;
                 return orderInventory;