Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
srm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
aship
srm
Commits
b52840e9
Commit
b52840e9
authored
Aug 12, 2019
by
顾俭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aship/aship#1 防伪码功能:申请防伪码接口
parent
3763b9eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
34 deletions
+40
-34
logback-spring.xml
src/main/resources/logback-spring.xml
+22
-22
query.js
...ain/resources/static/app/srm/purchaseOrder/query/query.js
+18
-12
No files found.
src/main/resources/logback-spring.xml
View file @
b52840e9
...
...
@@ -29,28 +29,28 @@
<appender-ref
ref=
"FILE-OUT"
/>
</root>
<!--
错误日志写入error.log
-->
<
appender
name=
"ERROR-OUT"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
<
file>
log/error.log
</file
>
<
encoder
>
<
pattern>
[ %-5level] [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %logger{96} [%file:%line] - %msg%n
</pattern
>
<
/encoder
>
<
rollingPolicy
class=
"ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy"
>
<
fileNamePattern>
log/error-erp-%d{yyyy-MM-dd}.%i.log
</fileNamePattern
>
<
maxFileSize>
50 MB
</maxFileSize
>
<
maxHistory>
30
</maxHistory
>
<
totalSizeCap>
1GB
</totalSizeCap
>
<
/rollingPolicy
>
<
filter
class=
"ch.qos.logback.classic.filter.LevelFilter"
>
<
level>
ERROR
</level
>
<
onMatch>
ACCEPT
</onMatch
>
<
onMismatch>
DENY
</onMismatch
>
<
/filter
>
<
/appender
>
<!--
<!–错误日志写入error.log–>
-->
<
!--<appender name="ERROR-OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">--
>
<
!--<file>log/error-erp.log</file>--
>
<
!--<encoder>--
>
<
!--<pattern>[ %-5level] [%date{yyyy-MM-dd HH:mm:ss.SSS}] [%thread] %logger{96} [%file:%line] - %msg%n</pattern>--
>
<
!--</encoder>--
>
<
!--<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">--
>
<
!--<fileNamePattern>log/error-erp-%d{yyyy-MM-dd}.%i.log</fileNamePattern>--
>
<
!--<maxFileSize>50 MB</maxFileSize>--
>
<
!--<maxHistory>30</maxHistory>--
>
<
!--<totalSizeCap>1GB</totalSizeCap>--
>
<
!--</rollingPolicy>--
>
<
!--<filter class="ch.qos.logback.classic.filter.LevelFilter">--
>
<
!--<level>ERROR</level>--
>
<
!--<onMatch>ACCEPT</onMatch>--
>
<
!--<onMismatch>DENY</onMismatch>--
>
<
!--</filter>--
>
<
!--</appender>--
>
<!--
erp接口另加错误输出
-->
<
logger
name=
"com.i1.erp"
level=
"error"
>
<
appender-ref
ref=
"ERROR-OUT"
/
>
<
/logger
>
<!--
<!–erp接口另加错误输出–>
-->
<
!--<logger name="com.i1.erp" level="error">--
>
<
!--<appender-ref ref="ERROR-OUT"/>--
>
<
!--</logger>--
>
</configuration>
\ No newline at end of file
src/main/resources/static/app/srm/purchaseOrder/query/query.js
View file @
b52840e9
...
...
@@ -299,7 +299,7 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
var
barcodeInput
=
{};
var
barcodeDtlInput
=
[];
barcodeInput
.
factoryUid
=
$scope
.
selectedPurchaseOrder
.
factory
.
factoryUid
;
barcodeInput
.
purchaseOrderUid
=
$scope
.
selectedPurchaseOrder
.
poMst
.
purchaseOrderUid
;
barcodeInput
.
purchaseOrderUid
=
$scope
.
selectedPurchaseOrder
.
poMst
.
purchaseOrderUid
;
angular
.
forEach
(
$scope
.
barcodeGridOptions
.
data
,
function
(
item
)
{
if
(
item
.
barcodeAmount
&&
item
.
barcodeAmount
>
0
)
{
barcodeDtlInput
.
push
({
...
...
@@ -310,17 +310,23 @@ angular.module('IOne').controller('PurchaseOrderQueryController', function ($sco
}
});
barcodeInput
.
dtl
=
barcodeDtlInput
;
console
.
info
(
barcodeInput
);
//调用服务 /$scope.selectedPurchaseOrder.poMst.id/getBarcode
PoMstFileService
.
genBarcode
(
barcodeInput
).
then
(
function
(
response
)
{
console
.
info
(
response
);
console
.
info
(
response
.
data
);
});
$
(
'#get-barcode-dlg'
).
modal
(
'hide'
);
PoMstFileService
.
genBarcode
(
barcodeInput
).
then
(
function
(
response
)
{
if
(
response
.
data
)
{
if
(
response
.
data
.
code
==
'0'
)
{
UtilService
.
showInfo
(
"申请防伪码成功"
);
$
(
'#get-barcode-dlg'
).
modal
(
'hide'
);
}
else
{
UtilService
.
showError
(
"申请防伪码失败:<br>"
+
response
.
data
.
message
);
}
}
else
{
UtilService
.
showError
(
"申请防伪码失败:<br>"
+
response
);
}
},
function
(
response
)
{
UtilService
.
showError
(
"申请防伪码失败:<br>"
+
response
.
data
);
$
(
'#get-barcode-dlg'
).
modal
(
'hide'
);
}
);
};
// load po dtl data
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment