Skip to content

Update: Enquiry/enquiry.js,impm.cs #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
koala-v wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Update: Enquiry/enquiry.js,impm.cs #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e013366
Update: Enquiry/enquiry.js,impm.cs
koala-v Sep 22, 2016
a2f03f4
Merge branch 'master' of https://github.com/deoseal/WMS-EGDC
koala-v Oct 10, 2016
5ac810e
update: some bug
koala-v Oct 25, 2016
da2d04f
update: some bug
koala-v Oct 27, 2016
b26596b
update: some bug
koala-v Oct 28, 2016
ae86cc1
update: some bug
koala-v Nov 1, 2016
2bf6b03
update:some bug
koala-v Nov 3, 2016
fe9b6ea
update： some bug
koala-v Nov 4, 2016
b3fae20
update: some bug
koala-v Nov 15, 2016
19ec2fc
add cycleCount.js
koala-v Nov 29, 2016
cad875f
add:imcc2
koala-v Nov 30, 2016
66e7c4c
update:cycleCount.js
koala-v Dec 1, 2016
5aeb296
update: cycleCount.js
koala-v Dec 6, 2016
705e8a5
update: picking.js (readyonly StoreNo)
koala-v Dec 12, 2016
ef71180
update: putaway StagingAreFlag,Picking Scan Correct BarCode
koala-v Jan 19, 2017
19b2410
update: putway(StoreNo logic) ,picking (BalanceQty)
koala-v Jan 24, 2017
1e91c10
update : save PackingNo
koala-v Feb 8, 2017
adef27a
update carton logic
koala-v Feb 10, 2017
1508230
update：split PackingNo logic
koala-v Feb 14, 2017
12825c7
update: split PickingNo Logic
koala-v Feb 15, 2017
08a0e4c
update:split packingNo
koala-v Feb 20, 2017
f36d4f7
split packingNo
koala-v Feb 21, 2017
7d3378b
update:split
koala-v Mar 1, 2017
9d81f82
update split logic for deen
koala-v Mar 7, 2017
f8ba9d0
update putaway first enter StoreNo than BarCode
koala-v Aug 10, 2017
c973f80
update Scan GoodIssueNoteNo
koala-v Aug 24, 2017
34a3be1
change BarCode Drownlist To textBox , Focus BarCode for Putaway
koala-v Sep 15, 2017
6ddde71
update
koala-v Feb 27, 2018
5ac3e11
test
koala-v Feb 27, 2018
f2e0432
test
koala-v Feb 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WMS/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd platforms\android\build\outputs\apk

jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../../../../../key.keystore android-armv7-release-unsigned.apk alias_name

C:\Android\sdk\android-sdk\build-tools\22.0.1\zipalign.exe -v 4 android-armv7-release-unsigned.apk WMS-Egdc.apk
F:\Android\sdk\android-sdk\build-tools\22.0.1\zipalign.exe -v 4 android-armv7-release-unsigned.apk WMS-Egdc.apk

xcopy /y "%~dp0platforms\android\build\outputs\apk\WMS-Egdc.apk" "%~dp0"

Expand Down
3 changes: 2 additions & 1 deletion WMS/config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<widget defaultlocale="en-US" id="com.sysmagic.tc551" version="1.0.1.2" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:vs="http://schemas.microsoft.com/appx/2014/htmlapps">
<widget defaultlocale="en-US" id="com.sysmagic.tc551" version="1.0.1.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" xmlns:vs="http://schemas.microsoft.com/appx/2014/htmlapps">
<name>WMS-EGDC APP</name>
<description>
</description>
Expand All @@ -9,6 +9,7 @@
<allow-navigation href="http://*/*"/>
<allow-navigation href="https://*/*"/>
<allow-navigation href="data:*"/>
<allow-navigation href="http://192.168.0.229:8100"/>
<allow-intent href="http://*/*"/>
<allow-intent href="https://*/*"/>
<allow-intent href="sms:*"/>
Expand Down
6 changes: 3 additions & 3 deletions WMS/update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "1.0.1.5",
"updateLog": "Latest Version is 1.0.1.5"
}
"version": "1.0.1.16",
"updateLog": "Latest Version is 1.0.1.16"
}
45 changes: 45 additions & 0 deletions WMS/www/.tags1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/
!_TAG_FILE_SORTED 0 /0=unsorted, 1=sorted, 2=foldcase/
!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/
!_TAG_PROGRAM_NAME Exuberant Ctags //
!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/
!_TAG_PROGRAM_VERSION 5.8 //
refreshRcbp1 C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.refreshRcbp1 = function (scanBusinessPartyName, BusinessPartyName) {$/;" function line:29
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, false).then(function success(result) {$/;" function line:33
refreshGrnNos C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.refreshGrnNos = function (scanGrn, Grn) {$/;" function line:48
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, false).then(function success(result) {$/;" function line:53
showImgr1 C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.showImgr1 = function (Customer) {$/;" function line:64
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, true).then(function success(result) {$/;" function line:69
showDate C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.showDate = function (utc) {$/;" function line:79
showImgr2 C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.showImgr2 = function (blnGrn, GoodsReceiptNoteNo) {$/;" function line:82
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, true).then(function success(result) {$/;" function line:86
returnMain C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.returnMain = function () {$/;" function line:98
openCam C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.openCam = function (imgr2) {$/;" function line:103
GoToDetail C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.GoToDetail = function (Imgr1) {$/;" function line:120
UpdateInsertImgr2 C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var UpdateInsertImgr2 = function (barcode, Type) {$/;" function line:199
NewImgr2 C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.NewImgr2 = function () {$/;" function line:272
showImpr C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var showImpr = function (barcode) {$/;" function line:326
showImprk C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.showImprk = function () {$/;" function line:329
ShowImgr1Detail C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.ShowImgr1Detail = function (barcode) {$/;" function line:332
setScanQty C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var setScanQty = function (barcode, imgr2) {$/;" function line:341
Onfocus C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.Onfocus = function (type) {$/;" function line:393
ShowImprDetailNotQty C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.ShowImprDetailNotQty = function () {$/;" function line:402
setStoreNo C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.setStoreNo = function () {$/;" function line:431
setSnQty C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var setSnQty = function (barcode, imgr2) {$/;" function line:445
showSn C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var showSn = function (sn) {$/;" function line:459
openCam C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.openCam = function (type) {$/;" function line:490
openModal C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.openModal = function () {$/;" function line:524
ShowModalDetail C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.ShowModalDetail = function (results) {$/;" function line:541
updateQtyStatus C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.updateQtyStatus = function () {$/;" function line:561
closeModal C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.closeModal = function () {$/;" function line:573
returnList C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.returnList = function () {$/;" function line:579
clearInput C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.clearInput = function (type) {$/;" function line:589
changeQty C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.changeQty = function () {$/;" function line:611
onTap C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ onTap: function (e) {$/;" function line:627
checkConfirm C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.checkConfirm = function (results) {$/;" function line:641
enter C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ $scope.enter = function (ev, type) {$/;" function line:721
sendConfirm C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var sendConfirm = function (hmImgr2Confirm) {$/;" function line:746
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, true).then(function success(result) {});$/;" function line:779
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUriUpdate, false).then(function success(result) {});$/;" function line:813
GetImgr2ProductCode C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ var GetImgr2ProductCode = function (GoodsReceiptNoteNo) {$/;" function line:819
success C:\Users\Administrator\Desktop\WMS-EGDC\WMS\www\view\Putaway\putaway.js /^ ApiService.Get(objUri, true).then(function success(result) {$/;" function line:822
1 change: 1 addition & 0 deletions WMS/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<script src="view/Picking/picking.js"></script>
<script src="view/Putaway/putaway.js"></script>
<script src="view/GoodsTransfer/gt.js"></script>
<script src="view/CycleCount/cycleCount.js"></script>
<script>
moment.locale('en');
</script>
Expand Down
32 changes: 31 additions & 1 deletion WMS/www/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,17 @@ app.run( [

} );
} );
SqlService.Drop( 'Imgi3_Picking' ).then( function ( res ) {
SqlService.Create( 'Imgi3_Picking', TABLE_DB.Imgi3_Picking ).then( function ( res ) {

} );
} );
SqlService.Drop( 'Imcc2_CycleCount' ).then( function ( res ) {
SqlService.Create( 'Imcc2_CycleCount', TABLE_DB.Imcc2_CycleCount ).then( function ( res ) {

} );
} );

});
} );
$ionicPlatform.registerBackButtonAction( function ( e ) {
Expand Down Expand Up @@ -260,6 +271,7 @@ app.config( [ '$httpProvider', '$stateProvider', '$urlRouterProvider', '$ionicCo
} )
.state( 'grList', {
url: '/gr/list',
cache: 'false',
templateUrl: 'view/GoodsReceipt/list.html',
controller: 'GrListCtrl'
} )
Expand Down Expand Up @@ -291,6 +303,12 @@ app.config( [ '$httpProvider', '$stateProvider', '$urlRouterProvider', '$ionicCo
templateUrl: 'view/Picking/detail.html',
controller: 'PickingDetailCtrl'
} )
.state( 'CartonDetail', {
url: '/picking/Carton/:LineItemNo/:CustomerCode/:TrxNo/:GoodsIssueNoteNo',
cache: 'false',
templateUrl: 'view/Picking/CartonDetail.html',
controller: 'CartonDetailCtrl'
} )
.state( 'putawayList', {
url: '/putaway/list',
cache: 'false',
Expand All @@ -308,7 +326,19 @@ app.config( [ '$httpProvider', '$stateProvider', '$urlRouterProvider', '$ionicCo
cache: 'false',
templateUrl: 'view/GoodsTransfer/list.html',
controller: 'GtListCtrl'
} );
} )
.state( 'cycleCountList', {
url: '/cycleCount/list',
cache: 'false',
templateUrl: 'view/CycleCount/list.html',
controller: 'cycleCountCtrl'
} )
.state( 'cycleCountDetail', {
url: '/CycleCount/detail/:CustomerCode/:TrxNo',
cache: 'false',
templateUrl: 'view/CycleCount/detail.html',
controller: 'cycleCountDetailCtrl'
} ) ;
$urlRouterProvider.otherwise( '/login' );
} ] );

Expand Down
4 changes: 2 additions & 2 deletions WMS/www/js/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ var appConfig = angular.module('WMSAPP.config',[]);
appConfig.constant('ENV', {
website: 'www.sysfreight.net/app/wms/egdcwms',
api: 'www.sysfreight.net/apis/wms/egdcwms',
// api: 'localhost:5550',
// api: 'localhost:18104',
reset: {
website: 'www.sysfreight.net/app/wms/egdcwms',
api: 'www.sysfreight.net/apis/wms/egdcwms',
Expand All @@ -29,7 +29,7 @@ appConfig.constant('ENV', {
updateFile: 'update.json',
rootPath: 'WMSEGDC',
configFile: 'config.txt',
version: '1.0.1.5',
version: '1.0.1.16',
parameter: {
showSerialNo : false
},
Expand Down
7 changes: 6 additions & 1 deletion WMS/www/js/controllers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ appControllers.controller( 'IndexCtrl', [
} else {
PopupService.Info(popup, 'No Updates!').then();
}
}
};
$rootScope.$on( 'logout', function() {
$scope.Status.Login = false;
$ionicSideMenuDelegate.toggleLeft();
Expand Down Expand Up @@ -395,4 +395,9 @@ appControllers.controller( 'MainCtrl', [
reload: true
} );
};
$scope.func_CycleCount = function() {
$state.go( 'cycleCountList', {}, {
reload: true
} );
};
} ] );
Loading