Skip to content

S
srm
Commit 64ff60e9 authored by 顾俭's avatar 顾俭
Browse files
Options

Merge branch '#4' into 'master' 

aship/aship#4 防伪码功能-送货审核

See merge request !6
parents aff97361 05cae4a3
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 102 deletions
src/main/java/com/i1/erp/deo/service/DeliveryOrderSendService.java
View file @ 64ff60e9
......@@ -100,7 +100,9 @@ public class DeliveryOrderSendService implements IDeliveryOrderSendService {
Detail detail = Detail.of(doXmlDtlRecordList, "DTL");
doXmlDetailList.add(detail);
// 启用防伪码供应商没有箱标签dtl1
//Detail1
if(!"Y".equals(doMstFile.getSupplier().getUseBarcode())) {
List<DoDtlProductLabelFile> doDtlProductLabelFileList = doDtlProductLabelFileDao.findAllByDoMstId(doMstId);
List<Record> doXmlDtl1RecordList = new ArrayList<>();
if (!doDtlProductLabelFileList.isEmpty()) {
......@@ -142,7 +144,7 @@ public class DeliveryOrderSendService implements IDeliveryOrderSendService {
}
Detail detail1 = Detail.of(doXmlDtl1RecordList, "DTL1");
doXmlDetailList.add(detail1);
}
RecordSet recordSet = RecordSet.of(String.valueOf(i + 1), mst, doXmlDetailList);
recordSetList.add(recordSet);
} else {
......
src/main/java/com/i1/erp/deo/soap/DeliveryOrderSendClient.java
View file @ 64ff60e9
......@@ -14,12 +14,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import tw.com.dsc.tiptop.tiptopservicegateway.SRMFahuoRequestSRMFahuoRequest;
import tw.com.dsc.tiptop.tiptopservicegateway.SRMFahuoResponseSRMFahuoResponse;
import tw.com.dsc.tiptop.tiptopservicegateway.TIPTOPServiceGateWayPortType;
import tw.com.dsc.tiptop.tiptopservicegateway.*;
import java.util.Arrays;
import java.util.List;
......@@ -43,6 +40,12 @@ public class DeliveryOrderSendClient extends WebServiceClient {
@Value("${srm.soapWs.wsUrl}")
private String WS_URL;
@Value("${srm.soapWs.fahuoConfirm}")
public String ERP_FAHUO_CONFIRM_OP;
@Value("${srm.soapWs.wsdlUrl}")
private String WSDL_URL;
private Logger logger = LoggerFactory.getLogger(DeliveryOrderSendClient.class);
@Autowired
......@@ -57,7 +60,7 @@ public class DeliveryOrderSendClient extends WebServiceClient {
/**
* Send released delivery orders to ERP every one min.
*/
@Scheduled(fixedDelay = 3600000)
// @Scheduled(fixedDelay = 3600000)
@Transactional
public void autoSend() throws IOneServiceException {
try {
......@@ -126,6 +129,24 @@ public class DeliveryOrderSendClient extends WebServiceClient {
}
}
// 防伪码审核发货 只有动态客户端
@Transactional
public SyncResponse createClientAndSendDoMstFileBarcode(DoMstFile doMstFile) {
try {
if (StringUtils.isBlank(WSDL_URL) || StringUtils.isBlank(ERP_FAHUO_CONFIRM_OP)) {
throw new IOneServiceException("WSDL_URL or ERP_FAHUO_CONFIRM_OP 不可为空");
} else {
Client client = getClient(WSDL_URL);
SyncResponse syncResponse = sendDoMstFileBarcode(doMstFile, client);
client.destroy();
return syncResponse;
}
} catch (Exception e) {
logger.error("error", e);
return SyncResponse.of(FAIL_CODE, e.getMessage());
}
}
@Transactional
public SyncResponse sendDoMstFile1(DoMstFile doMstFile, Client client) {
try {
......@@ -151,6 +172,30 @@ public class DeliveryOrderSendClient extends WebServiceClient {
}
}
@Transactional
public SyncResponse sendDoMstFileBarcode(DoMstFile doMstFile, Client client) {
try {
SRMFahuoconfirmRequestSRMFahuoconfirmRequest request = prepareRequestBarcode(doMstFile);
Object[] objects;
try {
// 防伪码审核
objects = client.invoke(ERP_FAHUO_CONFIRM_OP, new Object[]{request});
} catch (Exception e) {
throw new IOneServiceException(e);
}
if (objects != null && objects.length > 0) {
logger.info(objects[0].toString());
SRMFahuoconfirmResponseSRMFahuoconfirmResponse originalResponse = (SRMFahuoconfirmResponseSRMFahuoconfirmResponse) objects[0];
return handleResponseBarcode(originalResponse, doMstFile);
} else {
updateSendToErpStatus(doMstFile, false, "ERP无响应.");
return SyncResponse.of(FAIL_CODE, "ERP无响应");
}
} catch (IOneServiceException e) {
return SyncResponse.of(FAIL_CODE, e.getMessage());
}
}
@Transactional
public SyncResponse sendDoMstFile2(DoMstFile doMstFile) {
try {
......@@ -180,6 +225,21 @@ public class DeliveryOrderSendClient extends WebServiceClient {
return srmFahuoRequest;
}
@Transactional
public SRMFahuoconfirmRequestSRMFahuoconfirmRequest prepareRequestBarcode(DoMstFile doMstFile) throws IOneServiceException {
Request xml;
xml = deliveryOrderSendService.sendDoXml(Arrays.asList(doMstFile.getId()));
if (xml == null) {
updateSendToErpStatus(doMstFile, false, "无法生成XML结构.");
throw new IOneServiceException("无法生成XML结构");
}
SRMFahuoconfirmRequestSRMFahuoconfirmRequest request = new SRMFahuoconfirmRequestSRMFahuoconfirmRequest();
request.setRequest(covertObjectToXML(xml, Request.class));
logger.info(request.getRequest());
return request;
}
@Transactional
public SyncResponse handleResponse(SRMFahuoResponseSRMFahuoResponse originalResponse, DoMstFile doMstFile) {
try {
......@@ -202,6 +262,28 @@ public class DeliveryOrderSendClient extends WebServiceClient {
}
}
@Transactional
public SyncResponse handleResponseBarcode(SRMFahuoconfirmResponseSRMFahuoconfirmResponse originalResponse, DoMstFile doMstFile) {
try {
logger.info(originalResponse.getResponse());
Response response = convertXMLToObject(originalResponse.getResponse(), Response.class);
if (response.getExecution().getStatus().getCode().equalsIgnoreCase("0")) {
updateSendToErpStatus(doMstFile, false, "提交审核成功");
return SyncResponse.of(SUCCESS_CODE, "提交审核成功");
} else {
String errorDetails = String.format("失败码：%s， 原因：%s，SQL：%s",
safeString(response.getExecution().getStatus().getCode()),
safeString(response.getExecution().getStatus().getDescription()),
safeString(response.getExecution().getStatus().getSqlcode()));
updateSendToErpStatus(doMstFile, false, errorDetails);
return SyncResponse.of(FAIL_CODE, errorDetails);
}
} catch (IOneServiceException e) {
return SyncResponse.of(FAIL_CODE, e.getMessage());
}
}
@Transactional
public void updateSendToErpStatus(DoMstFile doMstFile, Boolean status, String details) throws IOneServiceException {
logger.info("DeliveryOrderSendClient-updateSendToErpStatus start,ID:{},DeliveryOrderUid:{},SentToErp:{},SentToErpInfo:{}",
......@@ -215,10 +297,6 @@ public class DeliveryOrderSendClient extends WebServiceClient {
doMstFileNew.getId(), doMstFileNew.getDeliveryOrderUid(), doMstFileNew.getSentToErp(), doMstFileNew.getSentToErpInfo());
String info = details + "ID: " + doMstFile.getId() + "DeliveryOrderUid: " + doMstFile.getDeliveryOrderUid();
if (!status) {
logger.error(info);
} else {
logger.info(info);
}
}
}
\ No newline at end of file
src/main/java/com/i1/srm/deliveryOrder/web/DoMstFileController.java
View file @ 64ff60e9
......@@ -49,16 +49,21 @@ public class DoMstFileController extends AbstractController<DoMstFile, DoMstFile
@RequestMapping(value = "/release/{id}", method = RequestMethod.POST)
public SyncResponse release(@PathVariable Long id) throws IOneWebRestfulException {
try {
SyncResponse response;
DoMstFile doMstFile = service.get(id);
service.passOnlyUnreleased(doMstFile);
if(doMstFile.getSentToErp()) {
if (doMstFile.getSentToErp()) {
throw new IOneServiceException("该送货单已经同步成功，请重新获取查看");
}
if ("Y".equals(doMstFile.getSupplier().getUseBarcode())) {
response = deliveryOrderSendClient.createClientAndSendDoMstFileBarcode(doMstFile);
} else {
service.release(doMstFile);
SyncResponse response = deliveryOrderSendClient.createClientAndSendDoMstFile(doMstFile);
response = deliveryOrderSendClient.createClientAndSendDoMstFile(doMstFile);
if (response != null && response.getCode().equals(FAIL_CODE)) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
return response;
} catch (IOneServiceException e) {
throw new IOneWebRestfulException(e);
......@@ -85,8 +90,13 @@ public class DoMstFileController extends AbstractController<DoMstFile, DoMstFile
@ResourcePermission(values={Resource.VIEW})
@RequestMapping(value = "/checkDeliveryAmt/{id}", method = RequestMethod.GET)
public Map getTest(@PathVariable Long id) throws IOneWebRestfulException {
public Map checkDeliveryAmt(@PathVariable Long id) throws IOneWebRestfulException {
try {
// 防伪码没有生成箱标签
if ("Y".equals(service.get(id).getSupplier().getUseBarcode())) {
return ImmutableMap.of("message", "success");
}
List<Object[]> rows = service.checkDeliveryAmtByDoMstId(id);
if (rows.size() > 0) {
String msg = "";
......
src/main/resources/static/app/srm/deliveryOrder/query/query.html
View file @ 64ff60e9
......@@ -157,17 +157,26 @@
resource=" 'DELETE' ">删除
</button>
<button class="btn btn-default mrs" ng-click="createLabel()" ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || currentDeliveryOrderDetails.size == 0"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'CREATE_LABEL' ">创建箱标签
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'CREATE_LABEL' "
ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode != 'Y'">创建箱标签
</button>
<button class="btn btn-default mrs" ng-click="openSteelCoilOrNotDlg()"
ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || currentDeliveryOrderDetails.size == 0"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UPDATE_LABEL' ">修改箱标签
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UPDATE_LABEL' "
ng-if="queryCondition.poMst.supplier && queryCondition.poMst.supplier.useBarcode != 'Y'">修改箱标签
</button>
<button class="btn btn-default mrs" ng-click="release()" ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || uiOption.releasing"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'RELEASE' ">发布
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'RELEASE' "
ng-if="queryCondition.poMst.supplier.useBarcode !== 'Y'">发布
</button>
<button class="btn btn-default mrs" ng-click="unrelease()" ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '0' || uiOption.unReleasing"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UNDO_RELEASE' ">发布撤回
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'UNDO_RELEASE' "
ng-if="queryCondition.poMst.supplier.useBarcode !== 'Y'">发布撤回
</button>
<button class="btn btn-default mrs" ng-click="release()"
ng-disabled="!currentDeliveryOrder || currentDeliveryOrder.released == '1' || uiOption.releasing"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'RELEASE' "
ng-if="queryCondition.poMst.supplier.useBarcode === 'Y'">审核
</button>
<button class="btn btn-default mrs" ng-click="clickExport()" ng-disabled="gridOptions.data.length == 0"
acl-check func=" 'DELIVERY_ORDER_FUNCTION' " resource=" 'EXPORT' ">导出
......
src/main/resources/static/app/srm/deliveryOrder/query/query.js
View file @ 64ff60e9
......@@ -59,7 +59,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
name: '操作', field: "doMst.deliveryOrderUid",
cellTemplate: "<a ng-if='row.entity.doMst.released == \"1\"' href ng-click='grid.appScope.printDeliveryOrder(row.entity)' title='打印送货单'><i class='fa fa-print'></i></a> " +
"<a ng-if='row.entity.doMst.released == \"1\"' href style='margin-left: 5px;' ng-click='grid.appScope.printDeliveryOrderLabels(row.entity)' title='打印箱A4版标签'><i class='fa fa-print'></i></a>" +
"<a ng-if='row.entity.doMst.released == \"1\"' href style='margin-left: 10px;' ng-click='grid.appScope.printDeliveryOrderSingleLabel(row.entity)' title='打印箱条码标签'><i class='fa fa-print'></i></a>",
"<a ng-if='row.entity.doMst.released == \"1\" && row.entity.doMst.supplier.useBarcode != \"Y\"' href style='margin-left: 10px;' ng-click='grid.appScope.printDeliveryOrderSingleLabel(row.entity)' title='打印箱条码标签'><i class='fa fa-print'></i></a>",
width: 100, cellClass: 'print-icon'
},
{name: '送货单号', field: 'doMst.deliveryOrderUid', width: 120, cellTemplate: cellTemplate},
......@@ -166,7 +166,8 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
if ($scope.queryCondition.poMst.supplier.id) {
$scope.queryCondition.poMst.supplier = {
id: $scope.queryCondition.poMst.supplier.id,
name: $scope.queryCondition.poMst.supplier.name
name: $scope.queryCondition.poMst.supplier.name,
useBarcode: $scope.queryCondition.poMst.supplier.useBarcode
};
}
......@@ -204,12 +205,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
return ($scope.pageOption.page - 1) * $scope.pageOption.size + index + 1;
};
if (item.doMst.sentToErp == false && item.doMst.sentToErpInfo == null) {
item.doMst.sentToErpInfo = '无法连接ERP或等待下一个同步周期.';
item.doMst.sentToErpStatus = '未同步'
} else {
item.doMst.sentToErpStatus = item.doMst.sentToErp ? '成功' : '失败';
}
item.doMst.sentToErpStatus = item.doMst.sentToErp ? '已同步' : '未同步';
})
};
......@@ -320,6 +316,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
return;
}
if ($scope.queryCondition.poMst.supplier.useBarcode !== 'Y') {
if (results[1].data.length == 0) {
UtilService.showError("未生成箱标签，无法发布。请创建箱标签。");
$scope.uiOption.releasing = false;
......@@ -339,33 +336,27 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
return;
}
}
}
DoMstFileService.checkDeliveryAmt($scope.currentDeliveryOrder.id).then(function (checkResponse) {
if (checkResponse.data.message == 'success') {
DoMstFileService.release($scope.currentDeliveryOrder.id).then(function (releaseResponse) {
if (releaseResponse.data.code == '0') {
UtilService.showInfo("发布成功。");
angular.forEach($scope.gridOptions.data, function (item) {
if (item.doMst.deliveryOrderUid === $scope.currentDeliveryOrder.deliveryOrderUid) {
item.doMst.released = '1';
item.doMst.releasedDate = new Date();
item.doMst.sentToErpStatus = '成功';
item.doMst.sentToErpInfo = '同步ERP成功';
}
});
UtilService.showInfo("成功。");
$scope.uiOption.releasing = false;
$scope.queryDeliveryOrderDetails();
} else {
UtilService.showError("发布失败:<br>" + releaseResponse.data.message);
UtilService.showError("失败:<br>" + releaseResponse.data.message);
$scope.uiOption.releasing = false;
$scope.queryDeliveryOrderDetails();
}
}, function (releaseError) {
UtilService.showError("发布失败:<br>" + (releaseError.data.externalError || releaseError.data.error));
UtilService.showError("失败:<br>" + (releaseError.data.externalError || releaseError.data.error));
$scope.uiOption.releasing = false;
$scope.queryDeliveryOrderDetails();
})
} else {
UtilService.showError("发布失败：<br>" + checkResponse.data.message);
UtilService.showError("失败：<br>" + checkResponse.data.message);
$scope.uiOption.releasing = false;
}
}, function () {
......@@ -396,7 +387,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
item.doMst.printer = null;
item.doMst.sentToErp = false;
item.doMst.sentToErpStatus = '未同步';
item.doMst.sentToErpInfo = '无法连接ERP或等待下一个同步周期.';
item.doMst.sentToErpInfo = '';
}
});
} else {
......@@ -416,12 +407,7 @@ angular.module('IOne').controller('DeliveryOrderQueryController', function ($sco
$scope.clickExport = function () {
DoDtlFileService.getAllByExample($scope.queryCondition).then(function (response) {
var jsonData = response.data.map(function (item, index) {
if (item.doMst.sentToErp == false && item.doMst.sentToErpInfo == null) {
item.doMst.sentToErpInfo = '无法连接ERP或等待下一个同步周期.';
item.doMst.sentToErpStatus = '未同步'
} else {
item.doMst.sentToErpStatus = item.doMst.sentToErp ? '成功' : '失败';
}
item.doMst.sentToErpStatus = item.doMst.sentToErp ? '已同步' : '未同步';
return {
index: index + 1,
deliveryOrderUid: item.doMst.deliveryOrderUid || ' ',
......
src/main/resources/static/app/srm/deliveryOrder/update/update.html
View file @ 64ff60e9
......@@ -49,9 +49,15 @@
<!--ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL && op == 'MODIFY' && isSteelCoil()"-->
<!--ng-disabled="!updateDeliveryOrderForm.$valid">保存</button>-->
<button class="btn btn-default mrs" ng-click="saveDeliveryOrderProductList(true)"
ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL"
ng-if="uiOption.currentStatus == uiStatus.CREATE_LABEL && (currentDeliveryOrder.supplier.useBarcode !='Y')"
ng-disabled="!updateDeliveryOrderForm.$valid">保存并创建箱标签
</button>
<!--启用防伪码供应商useBarcode不创建箱标签-->
<button class="btn btn-default mrs" ng-click="saveDeliveryOrderProductList(false)"
ng-if="(uiOption.currentStatus == uiStatus.CREATE_LABEL) && (currentDeliveryOrder.supplier.useBarcode =='Y')"
ng-disabled="!updateDeliveryOrderForm.$valid">保存
</button>
</div>
</div>
......
src/main/resources/static/app/srm/deliveryOrder/update/update.js
View file @ 64ff60e9
......@@ -689,7 +689,8 @@ angular.module('IOne').controller('DeliveryOrderUpdateController', function ($ro
}
//check if the steel coil amount has been changed
if (!generateLabel) {
// barcode不产生箱标签修改 && $scope.deliveryOrderAggregationGridOptions.data[0].steelCoil == '1'
if (!generateLabel && $scope.deliveryOrderAggregationGridOptions.data[0].steelCoil == '1') {
DoDtlProductLabelFileService.getAllByExample({
doMst: {id: $scope.currentDeliveryOrderId}
}).then(function (response) {
......
src/main/resources/static/app/srm/deliveryOrder/view/view.html
View file @ 64ff60e9
......@@ -75,8 +75,10 @@
<div class="button-bar">
<button class="btn btn-primary" ng-click="printDeliveryOrder()" ng-disabled="currentDeliveryOrder.released !='1'">打印送货单</button>
<button class="btn btn-primary" ng-click="printDeliveryOrderLabels()" ng-disabled="productGridOption.data.length == 0 || currentDeliveryOrder.released !='1'">打印A4标签</button>
<button class="btn btn-primary" ng-click="printDeliveryOrderSingleLabel()" ng-disabled="productGridOption.data.length == 0 || currentDeliveryOrder.released !='1'">打印条码标签</button>
<button class="btn btn-primary" ng-click="saveLabels()" ng-hide="labelGridOption.data.length == 0 || labelGridOption.data[0].doDtlProduct.steelCoil == '0'"
<button class="btn btn-primary" ng-click="printDeliveryOrderSingleLabel()" ng-disabled="productGridOption.data.length == 0 || currentDeliveryOrder.released !='1'"
ng-if="currentDeliveryOrder.supplier.useBarcode !=='Y'">打印条码标签
</button>
<button class=" btn btn-primary" ng-click="saveLabels()" ng-hide="labelGridOption.data.length == 0 || labelGridOption.data[0].doDtlProduct.steelCoil == '0'"
ng-disabled="currentDeliveryOrder.released =='1'"
ng-if="false">保存钢卷信息
</button>
......@@ -90,7 +92,8 @@
<uib-tab index="1" heading="订单物料汇总">
<div ui-grid="productGridOption" ui-grid-selection ui-grid-resize-columns class="grid mts"></div>
</uib-tab>
<uib-tab index="2" heading="箱标签明细">
<uib-tab index="2" heading="箱标签明细"
ng-if="currentDeliveryOrder.supplier.useBarcode!='Y'">
<div ui-grid="labelGridOption" ui-grid-selection ui-grid-edit ui-grid-row-edit ui-grid-cellNav ui-grid-resize-columns class="grid mts"></div>
</uib-tab>
</uib-tabset>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment