Skip to content

T
topsun-bpm
Commit 99907050 authored by 赵汉亭's avatar 赵汉亭
Browse files
Options

Merge remote-tracking branch 'zht/dev' into dev

parents bf730840 d9cc4eb1
Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 22 deletions
.idea/mybatisx/templates.xml
View file @ 99907050
......@@ -48,8 +48,8 @@
<option name="tableUIInfoList">
<list>
<TableUIInfo>
<option name="className" value="SapStatsIndicatorsResult" />
<option name="tableName" value="sap_stats_indicators_result" />
<option name="className" value="NonProdApplyBaseInfo" />
<option name="tableName" value="non_prod_apply_base_info" />
</TableUIInfo>
</list>
</option>
......
huigou-xt/src/main/webapp/system/excelimport/AssignCodeImp.js
View file @ 99907050
......@@ -87,6 +87,11 @@ $.extend(ExcelImpManager.prototype,{
this._$('#toolbar_import').uploadButton({
filetype:['xls','xlsx'],
param:function(){
debugger
//截断事件发送请求，为全局code赋值
let code = prompt("请输入编码");
Public.syncAjax(web_app.name + '/globalCode/revampGlobalCode.ajax',{code:code})
if(_self.getTemplateId()==''){
Public.errorTip('请选择模板。');
return false;
......
topsun-xt/src/main/webapp/biz/topsun/proofing/technologyAndBom/technologyAndBom.js
View file @ 99907050
......@@ -146,6 +146,7 @@ function loadProofingApplyGrid(obj) {
height: 400,
heightDiff: -8,
checkbox: true,
async: false,
fixedCellHeight: true,
selectRowButtonOnly: true,
onAfterShowData :function(data) {
......@@ -162,14 +163,7 @@ function loadProofingApplyGrid(obj) {
}
function a(){
b()//必须这个函数执行完，才可以执行下方的函数
c()
}function b(){
//这个函数是异步的
}function c(){
}
/**
* 详情页初始化调用
......@@ -243,12 +237,14 @@ function showTechnologyTable(productId){
technologyObj.parms={productId:productId};
loadProofingApplyGrid(technologyObj);
debugger
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
setTimeout(function() {
let result = DataUtil.getUpdateRow(technologyObj.gridManager); // 获取选中行
processObj.parms = { technologyId: result.technologyId };
processBomObj.parms = { technologyId: result.technologyId };
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
loadProofingApplyGrid(processObj);
loadProofingApplyGrid(processBomObj);
}, 2000);
}
}
......
topsun-xt/src/main/webapp/biz/topsun/proofing/workInstruction.js
View file @ 99907050
......@@ -10,7 +10,6 @@
* 如果是详情页，展示数据，隐藏按钮
* @type {boolean}
*/
debugger
let isDetailPage = ($("#isDetailPage").val() === "true");
if (isDetailPage) {
$("#jobPageTop").hide();
......@@ -40,7 +39,6 @@ function saveForm(){
url : web_app.name + '/workInstruction/saveWorkInstruction.ajax',
param:{},
success : function(data) {
debugger
$("#workInstructionBaseInfoId").val(data.workInstructionBaseInfoId);
$("#workInstructionMaterialInfoId").val(data.workInstructionMaterialInfoId);
$("#workInstructionOptionalAttributeId").val(data.workInstructionOptionalAttributeId);
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp 0 → 100644
View file @ 99907050
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/statsIndicators/statsIndicators.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<%-- <x:hidden name="id"/>--%>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<%-- <x:hidden name="fullId"/>--%>
<%-- <x:hidden name="organId"/>--%>
<%-- <x:hidden name="organName"/>--%>
<%-- <x:hidden name="deptId"/>--%>
<%-- <x:hidden name="deptName"/>--%>
<%-- <x:hidden name="positionId"/>--%>
<%-- <x:hidden name="positionName"/>--%>
<%-- <x:hidden name="personMemberId"/>--%>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="申请人填写区域" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="applicationId" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="applicant" label="申请人" labelCol="1" fieldCol="2"/>
<x:inputC name="department" label="申请部门" labelCol="1" fieldCol="2"/>
<x:inputC name="applicationDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType"/>
<x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="approver" label="批准人" labelCol="1" fieldCol="2"/>
<x:inputC name="approvalDate" label="批准日期" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
</div>
<x:title title="维护物品总体内容" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="layout" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
</div>
<div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务状态" dictionary="serviceusage" labelCol="1" fieldCol="11"/>
</div>
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
</div>
</form>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/statsIndicators/statsIndicators.js
View file @ 99907050
......@@ -134,7 +134,6 @@ function getExtendedData(processAction) {
gridManager: _grid,
isAllData: isAllData
});
debugger
if (!datas) {
return false;
}else if (datas.some(item => item.ekostl === "" && item.eaufnr === "")){
......
topsun/src/main/java/com/huigou/topsun/base/dictionary/GlobalCode.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.base.dictionary;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
public class GlobalCode {
private static AtomicReference<String> str = new AtomicReference<>("");
public static void set(String newValue) {
str.set(newValue);
}
public static String get() {
return str.get();
}
}
topsun/src/main/java/com/huigou/topsun/base/dictionary/application/impl/DictionaryImportApplicationImpl.java
View file @ 99907050
......@@ -3,6 +3,7 @@ package com.huigou.topsun.base.dictionary.application.impl;
import cn.hutool.core.util.NumberUtil;
import com.huigou.data.jdbc.util.BatchSqlUpdateDetail;
import com.huigou.data.query.model.QueryDescriptor;
import com.huigou.topsun.base.dictionary.GlobalCode;
import com.huigou.topsun.base.dictionary.application.DictionaryImportApplication;
import com.huigou.topsun.base.dictionary.domain.DictionaryImportData;
import com.huigou.uasp.bmp.common.application.BaseApplication;
......@@ -37,7 +38,7 @@ public class DictionaryImportApplicationImpl extends BaseApplication implements
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "queryTempData");
//前提是建立数据字典，不添加明细。这里传入数据字典的编码
String dictionaryId = sqlExecutorDao.queryToString(queryDescriptor.getSql(), "currency");
String dictionaryId = sqlExecutorDao.queryToString(queryDescriptor.getSql(), GlobalCode.get());
String sql = queryDescriptor.getSqlByName("queryImpTempDatas");
//获取导入的数据条目
......
topsun/src/main/java/com/huigou/topsun/base/dictionary/controller/GlobalCodeController.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.base.dictionary.controller;
import com.huigou.topsun.base.dictionary.GlobalCode;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.stereotype.Controller;
@Controller
@ControllerMapping("/globalCode")
public class GlobalCodeController extends CommonController {
public String revampGlobalCode(){
SDO sdo = this.getSDO();
String code = sdo.getString("code");
GlobalCode.set(code);
return success();
}
}
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/NonProdApplyApplication.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.sap.nonProdApply.application;
public interface NonProdApplyApplication{
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.sap.nonProdApply.application.impl;
public class NonProdApplyApplicationImpl {
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.sap.nonProdApply.controller;
import com.huigou.context.Operator;
import com.huigou.context.OrgUnit;
import com.huigou.topsun.base.dictionary.GlobalCode;
import com.huigou.topsun.sap.statsIndicators.application.SapStatsIndicatorsApplication;
import com.huigou.topsun.sap.statsIndicators.domain.SapStatsIndicators;
import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import org.springframework.stereotype.Controller;
import java.text.SimpleDateFormat;
import java.util.Date;
@Controller
@ControllerMapping("/sapNonProdApply")
public class NonProdApplyController extends CommonController {
protected String getPagePath() {
return "/biz/topsun/sap/nonProdApply/";
}
public static String generateApplicationNo() {
String dateStamp =getCurrentDate("yyyyMMdd");
// 生成10位随机数
String randomNumber = String.format("%010d", (int) (Math.random() * 10000000000L));
// 组合申请单编号
String applicationNumber = dateStamp + "-" + "M" + "-" + randomNumber;
return applicationNumber;
}
public static String getCurrentDate(String format) {
Date date = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat(format);
String formattedDate = dateFormat.format(date);
return formattedDate;
}
public String forwardNonProdApplyDetail(){
this.putAttribute("applicationId",generateApplicationNo());
this.putAttribute("applicationDate",getCurrentDate("yyyy/MM/dd"));
return forward("nonProdApplyDetail");
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java 0 → 100644
View file @ 99907050
package com.huigou.topsun.sap.nonProdApply.domain;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
* 非产品/非本成品类物料主数据维护申请基础表
* @TableName non_prod_apply_base_info
*/
@Table(name="non_prod_apply_base_info")
@Data
@Entity
public class NonProdApplyBaseInfo implements Serializable {
/**
* 申请单编号
*/
@Id
@Column(name = "application_id")
private Integer applicationId;
/**
* 申请人
*/
private String applicant;
/**
* 申请部门
*/
private String department;
/**
* 申请日期
*/
@Column(name = "application_date")
private Date applicationDate;
/**
* 维护类型
*/
@Column(name = "maintenance_type")
private String maintenanceType;
/**
* 批准状态
*/
@Column(name = "approval_status")
private String approvalStatus;
/**
* 批准人
*/
private String approver;
/**
* 批准日期
*/
@Column(name = "approval_date")
private Date approvalDate;
/**
* 通用品名
*/
@Column(name = "generic_name")
private String genericName;
/**
* 适用标准
*/
@Column(name = "applicable_standard")
private String applicableStandard;
/**
* 基本计量单位
*/
@Column(name = "base_unit")
private String baseUnit;
/**
* 规格
*/
private String specifications;
/**
* 材质
*/
private String material;
/**
* 版式
*/
private String layout;
/**
* 尺码
*/
private String size;
/**
* 品牌
*/
private String brand;
/**
* 用途
*/
@Column(name = "material_usage")
private String materialUsage;
/**
* 物品属性
*/
@Column(name = "item_attributes")
private String itemAttributes;
/**
* 业务用途
*/
@Column(name = "business_usage")
private String businessUsage;
/**
* 文本说明
*/
@Column(name = "text_description")
private String textDescription;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/statsIndicators/application/impl/SapStatsIndicatorsApplicationImpl.java
View file @ 99907050
......@@ -117,10 +117,8 @@ public class SapStatsIndicatorsApplicationImpl extends FlowBroker implements Sap
sapStatsIndicators.setStatusId(status.getId());
sapStatsIndicatorsRepository.save(sapStatsIndicators);
//审核完成、远程调用sap接口
// 延迟3秒后异步执行sendSapDate方法
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
executor.schedule(() -> sendSapDate(bizId), 3, TimeUnit.SECONDS);
executor.shutdown(); // 任务执行完毕后关闭executor
sendSapDate(bizId);
}
@Override
......
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