Commit 0348e752 by 熊智

update

parent 27968fa5
Showing with 789 additions and 360 deletions
......@@ -65,6 +65,17 @@ public class AbstractBrandInfo extends com.kingdee.eas.framework.DataBaseInfo im
setString("brandType", item.getValue());
}
}
/**
* Object:Ʒ's ׼ƷIDproperty
*/
public String getStandardId()
{
return getString("standardId");
}
public void setStandardId(String item)
{
setString("standardId", item);
}
public BOSObjectType getBOSType()
{
return new BOSObjectType("15619431");
......
......@@ -118,40 +118,7 @@ public class BrandControllerBean extends AbstractBrandControllerBean {
* @throws Throwable
* @date 2020-6-2 下午06:21:09
*/
private void synPTBrand(Context ctx, BrandInfo info) throws BOSException {
String isStartBrandSyn = DCUtil.getInitSysValueByParamNumber(ctx, "isStartBrandSyn");
if ("true".equals(isStartBrandSyn)) {
HproseHttpClient client = new HproseHttpClient();
String synBrandAddress = DCUtil.getInitSysValueByParamNumber(ctx, "synBrandAddress");
client.useService(synBrandAddress);
JSONArray arr = new JSONArray();
Map<String, Object> map = new HashMap<String, Object>();
map.put("BrandID", info.getString("id"));
map.put("BrandNumber", info.getNumber());
map.put("BrandName", info.getName());
map.put("IsForeignBrand", info.isIsForeignBrands());
map.put("BrandStatus", info.getStatus().getValue());
arr.add(map);
try {
client.setHeader("Referer", "SCM_ERP");
String result = (String) client.invoke("synchro_scm_brand", new Object[] { arr.toJSONString() });
JSONObject resultdata = JSONObject.parseObject(result);
Object code = resultdata.get("errcode");
int c = Integer.parseInt(String.valueOf(code));
if (c == 0) {
info.setIsSynPT(true);
BrandFactory.getLocalInstance(ctx).updatePartial(info, XZUtil.getSeletor("isSynPT"));
} else {// 同步失败
info.setIsSynPT(false);
BrandFactory.getLocalInstance(ctx).updatePartial(info, XZUtil.getSeletor("isSynPT"));
logger.error("品牌同步失败:" + info.getNumber() + "原因:" + resultdata.getString("errmsg"));
throw XZAppUtil.diyEASBizException(resultdata.getString("errmsg"));
}
} catch (Throwable e) {
throw new BOSException(e);
}
}
}
private void synPTBrand(Context ctx, BrandInfo info) throws BOSException {}
@Override
protected IObjectPK _submit(Context ctx, IObjectValue model) throws BOSException, EASBizException {
......
......@@ -53,12 +53,14 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
protected com.kingdee.bos.ctrl.swing.KDLabelContainer contStatus;
protected com.kingdee.bos.ctrl.swing.KDCheckBox chkisForeignBrands;
protected com.kingdee.bos.ctrl.swing.KDLabelContainer contbrandType;
protected com.kingdee.bos.ctrl.swing.KDLabelContainer contstandardId;
protected com.kingdee.bos.ctrl.swing.KDTextField txtNumber;
protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtName;
protected com.kingdee.bos.ctrl.swing.KDTextField txtSimpleName;
protected com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox txtDescription;
protected com.kingdee.bos.ctrl.swing.KDComboBox Status;
protected com.kingdee.bos.ctrl.swing.KDComboBox brandType;
protected com.kingdee.bos.ctrl.swing.KDTextField txtstandardId;
protected com.kingdee.eas.basedata.master.material.BrandInfo editData = null;
/**
* output class constructor
......@@ -86,12 +88,14 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
this.contStatus = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
this.chkisForeignBrands = new com.kingdee.bos.ctrl.swing.KDCheckBox();
this.contbrandType = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
this.contstandardId = new com.kingdee.bos.ctrl.swing.KDLabelContainer();
this.txtNumber = new com.kingdee.bos.ctrl.swing.KDTextField();
this.txtName = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
this.txtSimpleName = new com.kingdee.bos.ctrl.swing.KDTextField();
this.txtDescription = new com.kingdee.bos.ctrl.extendcontrols.KDBizMultiLangBox();
this.Status = new com.kingdee.bos.ctrl.swing.KDComboBox();
this.brandType = new com.kingdee.bos.ctrl.swing.KDComboBox();
this.txtstandardId = new com.kingdee.bos.ctrl.swing.KDTextField();
this.kDLabelContainer1.setName("kDLabelContainer1");
this.kDLabelContainer2.setName("kDLabelContainer2");
this.kDLabelContainer3.setName("kDLabelContainer3");
......@@ -99,12 +103,14 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
this.contStatus.setName("contStatus");
this.chkisForeignBrands.setName("chkisForeignBrands");
this.contbrandType.setName("contbrandType");
this.contstandardId.setName("contstandardId");
this.txtNumber.setName("txtNumber");
this.txtName.setName("txtName");
this.txtSimpleName.setName("txtSimpleName");
this.txtDescription.setName("txtDescription");
this.Status.setName("Status");
this.brandType.setName("brandType");
this.txtstandardId.setName("txtstandardId");
// CoreUI
this.btnSave.setVisible(false);
this.btnSave.setEnabled(false);
......@@ -149,6 +155,11 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
this.contbrandType.setBoundLabelLength(60);
this.contbrandType.setBoundLabelUnderline(true);
this.contbrandType.setVisible(true);
// contstandardId
this.contstandardId.setBoundLabelText(resHelper.getString("contstandardId.boundLabelText"));
this.contstandardId.setBoundLabelLength(100);
this.contstandardId.setBoundLabelUnderline(true);
this.contstandardId.setVisible(true);
// txtNumber
this.txtNumber.setMaxLength(80);
// txtName
......@@ -164,7 +175,12 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
this.brandType.setVisible(true);
this.brandType.addItems(EnumUtils.getEnumList("com.kingdee.eas.basedata.master.material.BrandTypeEnum").toArray());
this.brandType.setRequired(false);
this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtName,txtNumber,txtDescription,txtSimpleName,Status,chkisForeignBrands,brandType}));
// txtstandardId
this.txtstandardId.setVisible(true);
this.txtstandardId.setHorizontalAlignment(2);
this.txtstandardId.setMaxLength(100);
this.txtstandardId.setRequired(false);
this.setFocusTraversalPolicy(new com.kingdee.bos.ui.UIFocusTraversalPolicy(new java.awt.Component[] {txtName,txtNumber,txtDescription,txtSimpleName,Status,chkisForeignBrands,brandType,txtstandardId}));
this.setFocusCycleRoot(true);
//Register control's property binding
registerBindings();
......@@ -190,7 +206,7 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
*/
public void initUIContentLayout()
{
this.setBounds(new Rectangle(0, 0, 323, 130));
this.setBounds(new Rectangle(0, 0, 323, 129));
this.setLayout(null);
kDLabelContainer1.setBounds(new Rectangle(10, 13, 300, 19));
this.add(kDLabelContainer1, null);
......@@ -206,6 +222,8 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
this.add(chkisForeignBrands, null);
contbrandType.setBounds(new Rectangle(10, 79, 300, 19));
this.add(contbrandType, null);
contstandardId.setBounds(new Rectangle(10, 138, 270, 19));
this.add(contstandardId, null);
//kDLabelContainer1
kDLabelContainer1.setBoundEditor(txtNumber);
//kDLabelContainer2
......@@ -218,6 +236,8 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
contStatus.setBoundEditor(Status);
//contbrandType
contbrandType.setBoundEditor(brandType);
//contstandardId
contstandardId.setBoundEditor(txtstandardId);
}
......@@ -333,7 +353,8 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
dataBinder.registerBinding("simpleName", String.class, this.txtSimpleName, "text");
dataBinder.registerBinding("description", String.class, this.txtDescription, "_multiLangItem");
dataBinder.registerBinding("Status", com.kingdee.eas.basedata.master.material.BrandStatusEnum.class, this.Status, "selectedItem");
dataBinder.registerBinding("brandType", com.kingdee.eas.basedata.master.material.BrandTypeEnum.class, this.brandType, "selectedItem");
dataBinder.registerBinding("brandType", com.kingdee.eas.basedata.master.material.BrandTypeEnum.class, this.brandType, "selectedItem");
dataBinder.registerBinding("standardId", String.class, this.txtstandardId, "text");
}
//Regiester UI State
private void registerUIState(){
......@@ -486,7 +507,8 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
getValidateHelper().registerBindProperty("simpleName", ValidateHelper.ON_SAVE);
getValidateHelper().registerBindProperty("description", ValidateHelper.ON_SAVE);
getValidateHelper().registerBindProperty("Status", ValidateHelper.ON_SAVE);
getValidateHelper().registerBindProperty("brandType", ValidateHelper.ON_SAVE);
getValidateHelper().registerBindProperty("brandType", ValidateHelper.ON_SAVE);
getValidateHelper().registerBindProperty("standardId", ValidateHelper.ON_SAVE);
}
......@@ -532,6 +554,7 @@ public abstract class AbstractBrandEditUI extends com.kingdee.eas.framework.clie
sic.add(new SelectorItemInfo("description"));
sic.add(new SelectorItemInfo("Status"));
sic.add(new SelectorItemInfo("brandType"));
sic.add(new SelectorItemInfo("standardId"));
return sic;
}
......
......@@ -7,4 +7,5 @@ contStatus.boundLabelText=\u54C1\u724C\u72B6\u6001\uFF1A
Status.items=[Enum]com.kingdee.eas.basedata.master.material.BrandStatusEnum
chkisForeignBrands.text=\u5883\u5916\u54C1\u724C
contbrandType.boundLabelText=\u54C1\u724C\u7C7B\u578B
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
\ No newline at end of file
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
contstandardId.boundLabelText=\u6807\u51C6\u54C1\u724CID
\ No newline at end of file
......@@ -7,4 +7,5 @@ contStatus.boundLabelText=\u54C1\u724C\u72B6\u6001\uFF1A
Status.items=[Enum]com.kingdee.eas.basedata.master.material.BrandStatusEnum
chkisForeignBrands.text=\u5883\u5916\u54C1\u724C
contbrandType.boundLabelText=\u54C1\u724C\u7C7B\u578B
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
\ No newline at end of file
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
contstandardId.boundLabelText=\u6807\u51C6\u54C1\u724CID
\ No newline at end of file
......@@ -7,4 +7,5 @@ contStatus.boundLabelText=\u54C1\u724C\u72C0\u614B\uFF1A
Status.items=[Enum]com.kingdee.eas.basedata.master.material.BrandStatusEnum
chkisForeignBrands.text=\u5883\u5916\u54C1\u724C
contbrandType.boundLabelText=\u54C1\u724C\u985E\u578B
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
\ No newline at end of file
brandType.items=[Enum]com.kingdee.eas.basedata.master.material.BrandTypeEnum
contstandardId.boundLabelText=\u6A19\u6E96\u54C1\u724CID
\ No newline at end of file
......@@ -14,4 +14,5 @@ tblMain.Status=\u54C1\u724C\u72B6\u6001
tblMain.isForeignBrands=\u5883\u5916\u54C1\u724C
tblMain.isSynPT=\u5DF2\u540C\u6B65
tblMain.brandType=\u54C1\u724C\u7C7B\u578B
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u79F0</t\:Cell><t\:Cell>\u7B80\u79F0</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u521B\u5EFA\u65F6\u95F4</t\:Cell><t\:Cell>\u6700\u540E\u4FEE\u6539\u65F6\u95F4</t\:Cell><t\:Cell>\u521B\u5EFA\u8005\u7F16\u7801</t\:Cell><t\:Cell>\u521B\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7F16\u7801</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72B6\u6001</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u7C7B\u578B</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
tblMain.standardId=\u6807\u51C6\u54C1\u724CID
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="standardId" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u79F0</t\:Cell><t\:Cell>\u7B80\u79F0</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u521B\u5EFA\u65F6\u95F4</t\:Cell><t\:Cell>\u6700\u540E\u4FEE\u6539\u65F6\u95F4</t\:Cell><t\:Cell>\u521B\u5EFA\u8005\u7F16\u7801</t\:Cell><t\:Cell>\u521B\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7F16\u7801</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72B6\u6001</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u7C7B\u578B</t\:Cell><t\:Cell>\u6807\u51C6\u54C1\u724CID</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
......@@ -14,4 +14,5 @@ tblMain.Status=\u54C1\u724C\u72B6\u6001
tblMain.isForeignBrands=\u5883\u5916\u54C1\u724C
tblMain.isSynPT=\u5DF2\u540C\u6B65
tblMain.brandType=\u54C1\u724C\u7C7B\u578B
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u79F0</t\:Cell><t\:Cell>\u7B80\u79F0</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u521B\u5EFA\u65F6\u95F4</t\:Cell><t\:Cell>\u6700\u540E\u4FEE\u6539\u65F6\u95F4</t\:Cell><t\:Cell>\u521B\u5EFA\u8005\u7F16\u7801</t\:Cell><t\:Cell>\u521B\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7F16\u7801</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72B6\u6001</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u7C7B\u578B</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
tblMain.standardId=\u6807\u51C6\u54C1\u724CID
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="standardId" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u79F0</t\:Cell><t\:Cell>\u7B80\u79F0</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u521B\u5EFA\u65F6\u95F4</t\:Cell><t\:Cell>\u6700\u540E\u4FEE\u6539\u65F6\u95F4</t\:Cell><t\:Cell>\u521B\u5EFA\u8005\u7F16\u7801</t\:Cell><t\:Cell>\u521B\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7F16\u7801</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72B6\u6001</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u7C7B\u578B</t\:Cell><t\:Cell>\u6807\u51C6\u54C1\u724CID</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
......@@ -14,4 +14,5 @@ tblMain.Status=\u54C1\u724C\u72C0\u614B
tblMain.isForeignBrands=\u5883\u5916\u54C1\u724C
tblMain.isSynPT=\u5DF2\u540C\u6B65
tblMain.brandType=\u54C1\u724C\u985E\u578B
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u7A31</t\:Cell><t\:Cell>\u7C21\u7A31</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u5275\u5EFA\u6642\u9593</t\:Cell><t\:Cell>\u6700\u5F8C\u4FEE\u6539\u6642\u9593</t\:Cell><t\:Cell>\u5275\u5EFA\u8005\u7DE8\u78BC</t\:Cell><t\:Cell>\u5275\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7DE8\u78BC</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72C0\u614B</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u985E\u578B</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
tblMain.standardId=\u6A19\u6E96\u54C1\u724CID
tblMain.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol2"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol3"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol6"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol8"><c\:Protection hidden\="true" /></c\:Style><c\:Style id\="sCol10"><c\:Protection hidden\="true" /></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="simpleName" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="description" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="createTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateTime" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="creator.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol6" /><t\:Column t\:key\="creator.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="lastUpdateUser.number" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol8" /><t\:Column t\:key\="lastUpdateUser.name" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="id" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol10" /><t\:Column t\:key\="Status" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isForeignBrands" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="isSynPT" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="brandType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="standardId" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u54C1\u724C</t\:Cell><t\:Cell>\u540D\u7A31</t\:Cell><t\:Cell>\u7C21\u7A31</t\:Cell><t\:Cell>\u63CF\u8FF0</t\:Cell><t\:Cell>\u5275\u5EFA\u6642\u9593</t\:Cell><t\:Cell>\u6700\u5F8C\u4FEE\u6539\u6642\u9593</t\:Cell><t\:Cell>\u5275\u5EFA\u8005\u7DE8\u78BC</t\:Cell><t\:Cell>\u5275\u5EFA\u8005</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA\u7DE8\u78BC</t\:Cell><t\:Cell>\u4FEE\u6539\u4EBA</t\:Cell><t\:Cell>id</t\:Cell><t\:Cell>\u54C1\u724C\u72C0\u614B</t\:Cell><t\:Cell>\u5883\u5916\u54C1\u724C</t\:Cell><t\:Cell>\u5DF2\u540C\u6B65</t\:Cell><t\:Cell>\u54C1\u724C\u985E\u578B</t\:Cell><t\:Cell>\u6A19\u6E96\u54C1\u724CID</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
\ No newline at end of file
......@@ -242,6 +242,18 @@ public class XZAppUtil {
}
}
public static void abortProcessInst(Context ctx, String id) throws BOSException {
IEnactmentService wfService = EnactmentServiceFactory.createEnactService(ctx);
ProcessInstInfo[] processInstances = wfService.getProcessInstanceByHoldedObjectId(id);// 不包括已经结束的流程
if (null != processInstances && processInstances.length > 0) {// 存在流程
for(int i=0; i<processInstances.length; i++){
ProcessInstInfo inst = processInstances[i];
String instId = inst.getProcInstId(); // 获取流程实例ID
wfService.abortProcessInst(instId); // 终止工作流实例
}
}
}
/**
* 检测是否存在表名
*
......
package com.kingdee.eas.custom;
import com.kingdee.bos.framework.ejb.EJBRemoteException;
import com.kingdee.bos.util.BOSObjectType;
import java.rmi.RemoteException;
import com.kingdee.bos.framework.AbstractBizCtrl;
import com.kingdee.bos.orm.template.ORMObject;
import java.lang.String;
import com.kingdee.bos.util.*;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.bos.Context;
import com.kingdee.bos.BOSException;
import com.kingdee.bos.framework.*;
import com.kingdee.eas.custom.app.*;
public class GCFacade extends AbstractBizCtrl implements IGCFacade
{
public GCFacade()
{
super();
registerInterface(IGCFacade.class, this);
}
public GCFacade(Context ctx)
{
super(ctx);
registerInterface(IGCFacade.class, this);
}
public BOSObjectType getType()
{
return new BOSObjectType("96FEB1BB");
}
private GCFacadeController getController() throws BOSException
{
return (GCFacadeController)getBizController();
}
/**
*谿꼍澗운데-User defined method
*@param json json
*@return
*/
public String synRecBill(String json) throws BOSException, EASBizException
{
try {
return getController().synRecBill(getContext(), json);
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
/**
*股箇官辜데-User defined method
*@param orderID orderID
*/
public void createSaleOrder(String orderID) throws BOSException, EASBizException
{
try {
getController().createSaleOrder(getContext(), orderID);
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
/**
*錦맣饋簡땐데-User defined method
*@param id id
*/
public void updateSaleOrder(String id) throws BOSException, EASBizException
{
try {
getController().updateSaleOrder(getContext(), id);
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
/**
*谿꼍틔탬-User defined method
*/
public void synBrand() throws BOSException, EASBizException
{
try {
getController().synBrand(getContext());
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
/**
*谿꼍마운-User defined method
*@param json json
*@return
*/
public String synPayBill(String json) throws BOSException, EASBizException
{
try {
return getController().synPayBill(getContext(), json);
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
}
\ No newline at end of file
package com.kingdee.eas.custom;
import com.kingdee.bos.BOSException;
import com.kingdee.bos.BOSObjectFactory;
import com.kingdee.bos.util.BOSObjectType;
import com.kingdee.bos.Context;
public class GCFacadeFactory
{
private GCFacadeFactory()
{
}
public static com.kingdee.eas.custom.IGCFacade getRemoteInstance() throws BOSException
{
return (com.kingdee.eas.custom.IGCFacade)BOSObjectFactory.createRemoteBOSObject(new BOSObjectType("96FEB1BB") ,com.kingdee.eas.custom.IGCFacade.class);
}
public static com.kingdee.eas.custom.IGCFacade getRemoteInstanceWithObjectContext(Context objectCtx) throws BOSException
{
return (com.kingdee.eas.custom.IGCFacade)BOSObjectFactory.createRemoteBOSObjectWithObjectContext(new BOSObjectType("96FEB1BB") ,com.kingdee.eas.custom.IGCFacade.class, objectCtx);
}
public static com.kingdee.eas.custom.IGCFacade getLocalInstance(Context ctx) throws BOSException
{
return (com.kingdee.eas.custom.IGCFacade)BOSObjectFactory.createBOSObject(ctx, new BOSObjectType("96FEB1BB"));
}
public static com.kingdee.eas.custom.IGCFacade getLocalInstance(String sessionID) throws BOSException
{
return (com.kingdee.eas.custom.IGCFacade)BOSObjectFactory.createBOSObject(sessionID, new BOSObjectType("96FEB1BB"));
}
}
\ No newline at end of file
package com.kingdee.eas.custom;
import com.kingdee.bos.BOSException;
//import com.kingdee.bos.metadata.*;
import com.kingdee.bos.framework.*;
import com.kingdee.bos.util.*;
import com.kingdee.bos.Context;
import java.lang.String;
import com.kingdee.bos.util.*;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.bos.Context;
import com.kingdee.bos.BOSException;
import com.kingdee.bos.framework.*;
public interface IGCFacade extends IBizCtrl
{
public String synRecBill(String json) throws BOSException, EASBizException;
public void createSaleOrder(String orderID) throws BOSException, EASBizException;
public void updateSaleOrder(String id) throws BOSException, EASBizException;
public void synBrand() throws BOSException, EASBizException;
public String synPayBill(String json) throws BOSException, EASBizException;
}
\ No newline at end of file
package com.kingdee.eas.custom.app;
import javax.ejb.*;
import java.rmi.RemoteException;
import com.kingdee.bos.*;
import com.kingdee.bos.util.BOSObjectType;
import com.kingdee.bos.metadata.IMetaDataPK;
import com.kingdee.bos.metadata.rule.RuleExecutor;
import com.kingdee.bos.metadata.MetaDataPK;
//import com.kingdee.bos.metadata.entity.EntityViewInfo;
import com.kingdee.bos.framework.ejb.AbstractEntityControllerBean;
import com.kingdee.bos.framework.ejb.AbstractBizControllerBean;
//import com.kingdee.bos.dao.IObjectPK;
import com.kingdee.bos.dao.IObjectValue;
import com.kingdee.bos.dao.IObjectCollection;
import com.kingdee.bos.service.ServiceContext;
import com.kingdee.bos.service.IServiceContext;
import com.kingdee.eas.framework.Result;
import com.kingdee.eas.framework.LineResult;
import com.kingdee.eas.framework.exception.EASMultiException;
import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
import java.lang.String;
import com.kingdee.eas.common.EASBizException;
public abstract class AbstractGCFacadeControllerBean extends AbstractBizControllerBean implements GCFacadeController
{
protected AbstractGCFacadeControllerBean()
{
}
protected BOSObjectType getBOSType()
{
return new BOSObjectType("96FEB1BB");
}
public String synRecBill(Context ctx, String json) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("8308ddb4-0e3c-4bc9-962a-103324bcbca5"), new Object[]{ctx, json});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
String retValue = (String)_synRecBill(ctx, json);
svcCtx.setMethodReturnValue(retValue);
}
invokeServiceAfter(svcCtx);
return (String)svcCtx.getMethodReturnValue();
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected String _synRecBill(Context ctx, String json) throws BOSException, EASBizException
{
return null;
}
public void createSaleOrder(Context ctx, String orderID) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("7d5ee7d1-d7b9-4a53-a49d-e7fd5a9b6354"), new Object[]{ctx, orderID});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
_createSaleOrder(ctx, orderID);
}
invokeServiceAfter(svcCtx);
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected void _createSaleOrder(Context ctx, String orderID) throws BOSException, EASBizException
{
return;
}
public void updateSaleOrder(Context ctx, String id) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("d867f349-276b-46da-8d11-2bc2eb44ff11"), new Object[]{ctx, id});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
_updateSaleOrder(ctx, id);
}
invokeServiceAfter(svcCtx);
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected void _updateSaleOrder(Context ctx, String id) throws BOSException, EASBizException
{
return;
}
public void synBrand(Context ctx) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("809cd150-14f2-4f96-b924-3a05fb58f612"), new Object[]{ctx});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
_synBrand(ctx);
}
invokeServiceAfter(svcCtx);
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected void _synBrand(Context ctx) throws BOSException, EASBizException
{
return;
}
public String synPayBill(Context ctx, String json) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("792af8d9-f527-47c1-b5f7-eb83e12cd730"), new Object[]{ctx, json});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
String retValue = (String)_synPayBill(ctx, json);
svcCtx.setMethodReturnValue(retValue);
}
invokeServiceAfter(svcCtx);
return (String)svcCtx.getMethodReturnValue();
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected String _synPayBill(Context ctx, String json) throws BOSException, EASBizException
{
return null;
}
}
\ No newline at end of file
package com.kingdee.eas.custom.app;
import com.kingdee.bos.BOSException;
//import com.kingdee.bos.metadata.*;
import com.kingdee.bos.framework.*;
import com.kingdee.bos.util.*;
import com.kingdee.bos.Context;
import java.lang.String;
import com.kingdee.bos.util.*;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.bos.Context;
import com.kingdee.bos.BOSException;
import com.kingdee.bos.framework.*;
import java.rmi.RemoteException;
import com.kingdee.bos.framework.ejb.BizController;
public interface GCFacadeController extends BizController
{
public String synRecBill(Context ctx, String json) throws BOSException, EASBizException, RemoteException;
public void createSaleOrder(Context ctx, String orderID) throws BOSException, EASBizException, RemoteException;
public void updateSaleOrder(Context ctx, String id) throws BOSException, EASBizException, RemoteException;
public void synBrand(Context ctx) throws BOSException, EASBizException, RemoteException;
public String synPayBill(Context ctx, String json) throws BOSException, EASBizException, RemoteException;
}
\ No newline at end of file
......@@ -229,4 +229,26 @@ public abstract class AbstractHproseDockingFacadeControllerBean extends Abstract
return null;
}
public void synStandardBrand(Context ctx) throws BOSException, EASBizException
{
try {
ServiceContext svcCtx = createServiceContext(new MetaDataPK("6820308f-7e9b-4ea6-bb4c-5d000f347d15"), new Object[]{ctx});
invokeServiceBefore(svcCtx);
if(!svcCtx.invokeBreak()) {
_synStandardBrand(ctx);
}
invokeServiceAfter(svcCtx);
} catch (BOSException ex) {
throw ex;
} catch (EASBizException ex0) {
throw ex0;
} finally {
super.cleanUpServiceState();
}
}
protected void _synStandardBrand(Context ctx) throws BOSException, EASBizException
{
return;
}
}
\ No newline at end of file
......@@ -151,4 +151,16 @@ public class HproseDockingFacade extends AbstractBizCtrl implements IHproseDocki
throw new EJBRemoteException(err);
}
}
/**
*同步标准品牌-User defined method
*/
public void synStandardBrand() throws BOSException, EASBizException
{
try {
getController().synStandardBrand(getContext());
}
catch(RemoteException err) {
throw new EJBRemoteException(err);
}
}
}
\ No newline at end of file
......@@ -28,4 +28,5 @@ public interface HproseDockingFacadeController extends BizController
public void synIntertTable(Context ctx) throws BOSException, RemoteException;
public String createPayLocalGood(Context ctx, String json) throws BOSException, EASBizException, RemoteException;
public String updatePayLocalGood(Context ctx, String json) throws BOSException, EASBizException, RemoteException;
public void synStandardBrand(Context ctx) throws BOSException, EASBizException, RemoteException;
}
\ No newline at end of file
package com.kingdee.eas.custom.newbill;
import hprose.client.HproseHttpClient;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.SQLException;
......@@ -43,7 +41,7 @@ import com.kingdee.eas.basedata.person.PersonInfo;
import com.kingdee.eas.camel.XZUtil;
import com.kingdee.eas.camel.app.XZAppUtil;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.eas.custom.log.MessageSendUtil;
import com.kingdee.eas.custom.GCFacadeFactory;
import com.kingdee.eas.hr.emp.IPersonPosition;
import com.kingdee.eas.hr.emp.PersonPositionFactory;
import com.kingdee.eas.hr.emp.PersonPositionInfo;
......@@ -78,79 +76,6 @@ public class HproseDockingFacadeControllerBean extends AbstractHproseDockingFaca
@Override
protected HashMap _pubRunConnHp(Context ctx, String address, String jsonData, String function) throws BOSException {
HashMap<String, String> resultMap = new HashMap<String, String>();
String result = "";
HproseHttpClient client = null;
StringBuffer msgSb = new StringBuffer();
msgSb.append("========= hproseDockingControllerBean _pubRunConnHp ===============").append(" \n");
if (StringUtils.isEmpty(address)) {
address = DCUtil.getInitSysValueByParamNumber(ctx, "ws03");
}
msgSb.append("接口地址:" + address + "\n调用方法:" + function + "\n调用人:"+XZAppUtil.getUserInfo(ctx).getName()+"\n");
msgSb.append("参数值:" + jsonData).append(" \n");
try {
client = new HproseHttpClient();
client.useService(address);
client.setHeader("Referer", "SCM_ERP");
try {
result = (String) client.invoke(function, new Object[] { jsonData });
} catch (Exception e) {
if ("erpPullOrderAudit".equals(function)) {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人2")) ,2).PostData();
} else {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
}
throw XZAppUtil.diyEASBizException(function + "接口返回参数为空");
}
if (StringUtils.isEmpty(result)) {
msgSb.append("返回参数:空").append(" \n");
if ("erpPullOrderAudit".equals(function)) {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人2")) ,2).PostData();
} else {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
}
throw XZAppUtil.diyEASBizException(function + "接口返回参数为空");
}
JSONObject resultdata = JSONObject.parseObject(result);
Object code = resultdata.get("err_code");
int c = Integer.parseInt(String.valueOf(code));
if (c == 0) {
if (resultdata.get("data") != null) {
result = resultdata.get("data").toString();
} else {
result = "0000";
}
resultMap.put("0000", result);
} else {
result = (String) resultdata.get("err_msg");
resultMap.put("4444", result);
resultdata.put("err_msg", result);
msgSb.append("返回值:" + resultdata.toJSONString()).append(" \n");
// new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
if ("erpPullOrderAudit".equals(function)) {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人2")) ,2).PostData();
} else {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
}
}
} catch (Exception e) {
logger.error("连接hprose服务端异常," + function + " 具体错误信息是:" + e.getMessage() + "," + msgSb);
try {
// new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb + "\n" + e.getMessage(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
if ("erpPullOrderAudit".equals(function)) {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人2")) ,2).PostData();
} else {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo(msgSb.toString(), MessageSendUtil.getPersonsByName("开发负责人1")) ,2).PostData();
}
} catch (Exception e1) { }
} catch (Throwable e) {
logger.error("连接hprose服务端异常," + function + " 具体错误信息是:" + e.getMessage() + "," + msgSb);
} finally {
if (client != null) {
client.close();
}
}
return resultMap;
}
......@@ -302,27 +227,6 @@ public class HproseDockingFacadeControllerBean extends AbstractHproseDockingFaca
cdityClassifyReBillBiz.updatePartial(cdityInfo, sic);
}
}
// String address = DCUtil.getInitSysValueByParamNumber(ctx, "ws01");
// //System.out.println("当前json"+jsonObject.toJSON(listPage).toString());
// resultMap = _pubRunConnHp(ctx, address, jsonObject.toJSON(listPage).toString(), "CustomsItems");
// if (resultMap.get("0000") != null) {
// for (int i = 0; i < listPage.size(); i++) {
// HashMap<String, Object> jsoMap = listPage.get(i);
// String id = (String) jsoMap.get("FID");
// try {
// CdityClassifyReBillInfo cdityInfo = cdityClassifyReBillBiz.getCdityClassifyReBillInfo(new ObjectUuidPK(id));
// SelectorItemCollection sic = new SelectorItemCollection();
// sic.add(new SelectorItemInfo("description"));
// cdityInfo.setDescription("SYN");
// cdityClassifyReBillBiz.updatePartial(cdityInfo, sic);
// } catch (EASBizException e) {
// e.printStackTrace();
// } catch (BOSException e) {
// e.printStackTrace();
// }
// }
// }
} catch (BOSException e) {
logger.error("同步归类申请单异常,具体错误信息是:" + e.getMessage());
e.printStackTrace();
......@@ -914,4 +818,8 @@ public class HproseDockingFacadeControllerBean extends AbstractHproseDockingFaca
return fundInfoList;
}
@Override
protected void _synStandardBrand(Context ctx) throws BOSException, EASBizException {
GCFacadeFactory.getLocalInstance(ctx).synBrand();
}
}
\ No newline at end of file
......@@ -25,4 +25,5 @@ public interface IHproseDockingFacade extends IBizCtrl
public void synIntertTable() throws BOSException;
public String createPayLocalGood(String json) throws BOSException, EASBizException;
public String updatePayLocalGood(String json) throws BOSException, EASBizException;
public void synStandardBrand() throws BOSException, EASBizException;
}
\ No newline at end of file
......@@ -5,9 +5,16 @@ import org.apache.log4j.Logger;
import hprose.client.HproseHttpClient;
import javax.ejb.*;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import javax.xml.rpc.ServiceException;
import java.rmi.RemoteException;
import java.security.SecureRandom;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
......@@ -146,6 +153,10 @@ public class ScmCommonFacadeControllerBean extends AbstractScmCommonFacadeContro
StringBuilder result = new StringBuilder();
try {
URL realUrl = new URL(url);
if (url.startsWith("https:")) {
SSLContext sslContext = createCustomSslContext();
HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
}
HttpURLConnection conn = (HttpURLConnection) realUrl.openConnection();
// 发送POST请求必须设置如下两行
conn.setDoOutput(true);
......@@ -157,6 +168,9 @@ public class ScmCommonFacadeControllerBean extends AbstractScmCommonFacadeContro
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
conn.setRequestProperty("Content-Type", ContentType);
if (params.containsKey("token")) {
conn.setRequestProperty("Authorization", "Bearer " + params.get("token"));
}
conn.connect();
// 获取URLConnection对象对应的输出流
out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
......@@ -188,6 +202,29 @@ public class ScmCommonFacadeControllerBean extends AbstractScmCommonFacadeContro
return result.toString();
}
private SSLContext createCustomSslContext() {
TrustManager[] trustAllCerts = new X509TrustManager[] { new X509TrustManager() {
public void checkClientTrusted(X509Certificate[] ax509certificate, String s) throws CertificateException {
}
public void checkServerTrusted(X509Certificate[] ax509certificate, String s) throws CertificateException {
}
public X509Certificate[] getAcceptedIssuers() {
return null;
}
} };
SSLContext sslContext = null;
try {
sslContext = SSLContext.getInstance("TLS");
sslContext.init(null, trustAllCerts, new SecureRandom());
} catch (Exception e) {
logger.error(e);
}
return sslContext;
}
/**
* GET请求
*
......@@ -206,7 +243,14 @@ public class ScmCommonFacadeControllerBean extends AbstractScmCommonFacadeContro
String line = null;
try {
URL realUrl = new URL(url);
if (url.startsWith("https:")) {
SSLContext sslContext = createCustomSslContext();
HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
}
conn = (HttpURLConnection) realUrl.openConnection();// 根据URL生成HttpURLConnection
if (params.containsKey("token")) {
conn.setRequestProperty("Authorization", "Bearer " + params.get("token"));
}
conn.setRequestMethod("GET");// 默认GET请求
conn.connect();// 建立TCP连接
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
......
......@@ -10,8 +10,10 @@ import com.kingdee.bos.BOSException;
import com.kingdee.bos.Context;
import com.kingdee.bos.dao.IObjectPK;
import com.kingdee.bos.dao.IObjectValue;
import com.kingdee.bos.ui.face.UIRuleUtil;
import com.kingdee.eas.camel.XZUtil;
import com.kingdee.eas.camel.XZUtil.DateType;
import com.kingdee.eas.camel.app.XZAppUtil;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.eas.custom.newbill.ArVerificationRecordEntryCollection;
import com.kingdee.eas.custom.newbill.ArVerificationRecordEntryInfo;
......@@ -129,6 +131,35 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectLowdlfGoodAmount, zdDlfAmt.subtract(dlfAmt), formula);
}
}
Date recBizDate = entry.getRecBizDate();
Date recedBizDate = entry.getRecedBizDate();
int diffDays = XZUtil.getDiffDate(recBizDate, recedBizDate, DateType.Day);
// 获取账期约定天数
int zqDays = this.getZQDays(ctx, bussPlan.getString("id"));
if (diffDays > zqDays) {
BigDecimal overRate = this.getOverRate(ctx, bussPlan.getString("id"));
int overDays = diffDays - zqDays;
if (UIRuleUtil.isNotNull(overRate) && overDays > 0) {
formula = verifyAmt + "*" + overRate + "/100*" + overDays;
dlfAmt = verifyAmt.multiply(overRate).divide(new BigDecimal(100)).multiply(new BigDecimal(overDays)).setScale(2, RoundingMode.HALF_UP);
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdOverdueAmount, dlfAmt, formula);
}
}
}
/**
*
* @param ctx
* @param string
* @return
* @author 熊智
* @throws BOSException
* @date 2024-12-11 下午02:48:35
*/
private int getZQDays(Context ctx, String id) throws BOSException {
String sql = "select CFZQDay + CFFreeDays zqDays from CT_BZM_TFProtocolE5 where FParentID = '" + id + "' and CFServerProjectID = 'crYAAAJeQECIb4YR'";
int zqDays = (Integer) XZAppUtil.getValueBySql(ctx, sql, "zqDays");
return zqDays;
}
/**
......@@ -149,6 +180,8 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
Date recedBizDate = entry.getRecedBizDate();
int diffDays = XZUtil.getDiffDate(recBizDate, recedBizDate, DateType.Day);
BigDecimal rate = BigDecimal.ZERO;
BigDecimal overRate = BigDecimal.ZERO;
int overDays = 0;
BigDecimal dlfAmt = BigDecimal.ZERO;
if (diffDays >= 0) {
TFProtocolEntryE8Collection e8s = bussPlan.getE8();
......@@ -160,6 +193,12 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
rate = e8.getRate();
break;
}
if (i == e8s.size() -1) {
// 说明回款天数超过了约定的最大天数
rate = e8.getRate();
overRate = this.getOverRate(ctx, bussPlan.getString("id"));
overDays = diffDays - lessDay;
}
}
if (rate.compareTo(BigDecimal.ZERO) != 0) {
BigDecimal verifyAmt = entry.getThisVerifyAmt();
......@@ -167,6 +206,12 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
dlfAmt = verifyAmt.multiply(rate).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP);
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdlfGoodAmount, dlfAmt, formula);
}
if (UIRuleUtil.isNotNull(overRate) && overDays > 0) {
BigDecimal verifyAmt = entry.getThisVerifyAmt();
String formula = verifyAmt + "*" + overRate + "/100*" + overDays;
dlfAmt = verifyAmt.multiply(overRate).divide(new BigDecimal(100)).multiply(new BigDecimal(overDays)).setScale(2, RoundingMode.HALF_UP);
createDLfFundPool(ctx, info, billInfo, DCConstant.serviceProjectdOverdueAmount, dlfAmt, formula);
}
}
// if (zdDlfAmt.compareTo(dlfAmt) > 0) {
// String formula = zdDlfAmt + "-" + dlfAmt;
......@@ -216,4 +261,11 @@ public class ArVerificationRecordControllerBean extends AbstractArVerificationRe
}
return pks;
}
private BigDecimal getOverRate(Context ctx, String id) throws EASBizException, BOSException {
ServeProjectInfo dlfInfo = ServeProjectFactory.getLocalInstance(ctx).getServeProjectInfo("select id where number = 'F0117'");
String sql = "select CFOverdueRate from CT_BZM_TFProtocolE7 where CFSerProjectID = '" + dlfInfo.getId() + "' and FParentID = '" + id + "'";
BigDecimal overdueRate = (BigDecimal)XZAppUtil.getValueBySql(ctx, sql, "CFOverdueRate");
return overdueRate;
}
}
\ No newline at end of file
......@@ -19,7 +19,7 @@ public class ArVerificationRecordListUI extends AbstractArVerificationRecordList
super.onLoad();
this.actionAddNew.setVisible(false);
this.actionEdit.setVisible(false);
this.actionRemove.setVisible(false);
// this.actionRemove.setVisible(false);
}
@Override
......
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
<service name="WSGCFacade" provider="java:RPC">
<parameter name="className" value="com.kingdee.eas.custom.app.webservice.WSGCFacadeSrvProxy"/>
<parameter name="allowedMethods" value="*"/>
<beanMapping qname="myNS:WSBean" xmlns:myNS="urn:client.gcfacade" languageSpecificType="java:com.kingdee.bos.webservice.WSBean"/>
<beanMapping qname="myNS:WSInvokeException" xmlns:myNS="urn:client.gcfacade" languageSpecificType="java:com.kingdee.bos.webservice.WSInvokeException"/>
</service>
</deployment>
\ No newline at end of file
package com.kingdee.eas.custom.newbill.webservice;
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.message.SOAPEnvelope;
import org.apache.axis.message.SOAPHeaderElement;
import com.kingdee.bos.webservice.WSConfig;
import com.kingdee.bos.webservice.WSInvokeException;
import com.kingdee.bos.dao.IObjectPK;
import com.kingdee.bos.dao.ObjectMultiPK;
import com.kingdee.bos.dao.ormapping.ObjectUuidPK;
import com.kingdee.bos.orm.core.ORMEngine;
import com.kingdee.bos.webservice.BeanConvertHelper;
import com.kingdee.bos.webservice.BOSTypeConvertor;
import com.kingdee.bos.util.BOSUuid;
import com.kingdee.bos.webservice.WSConfig;
import com.kingdee.bos.webservice.MetaDataHelper;
import com.kingdee.bos.BOSObjectFactory;
public class WSGCFacadeSrvProxy {
public String synRecBill( String json ) throws WSInvokeException {
try {
return getController().synRecBill(
json);
}
catch( Throwable e ) {
throw new WSInvokeException( e ) ;
}
}
public String synPayBill( String json ) throws WSInvokeException {
try {
return getController().synPayBill(
json);
}
catch( Throwable e ) {
throw new WSInvokeException( e ) ;
}
}
private com.kingdee.eas.custom.IGCFacade getController() {
try {
if (WSConfig.getRomoteLocate()!=null&&WSConfig.getRomoteLocate().equals("false")){
Message message =MessageContext.getCurrentContext().getRequestMessage();
SOAPEnvelope soap =message.getSOAPEnvelope();
SOAPHeaderElement headerElement=soap.getHeaderByName(WSConfig.loginQName,WSConfig.loginSessionId);
String SessionId=headerElement.getValue();
return ( com.kingdee.eas.custom.IGCFacade )BOSObjectFactory.createBOSObject( SessionId , "com.kingdee.eas.custom.GCFacade") ;
} else {
return ( com.kingdee.eas.custom.IGCFacade )BOSObjectFactory.createRemoteBOSObject( WSConfig.getSrvURL() , "com.kingdee.eas.custom.GCFacade" , com.kingdee.eas.custom.IGCFacade.class ) ;
}
}
catch( Throwable e ) {
return ( com.kingdee.eas.custom.IGCFacade )ORMEngine.createRemoteObject( WSConfig.getSrvURL() , "com.kingdee.eas.custom.GCFacade" , com.kingdee.eas.custom.IGCFacade.class ) ;
}
}
private BeanConvertHelper getBeanConvertor() {
return new BeanConvertHelper();
}
}
\ No newline at end of file
......@@ -40,6 +40,7 @@ public class DCConstant {
public static String serviceProjectdlfGoodAmount = "101050";//代理费
public static String serviceProjectdzfwAmount = "101051";//垫资服务费
public static String serviceProjectdzwyAmount = "101052";//违约金
public static String serviceProjectdOverdueAmount = "101092";//超期代理费
public static String serviceProjectisTaxAmount = "101060";//税金
public static String serviceProjectvatAmount = "101070";//关税?
public static String serviceProjecttarrfiAmount = "101080";//增值税?
......
......@@ -712,6 +712,7 @@ public class dcSettleUtil {
BigDecimal rate = BigDecimal.ZERO;
String str = "";//费率计算公式
BigDecimal fdRate = BigDecimal.ZERO;
BigDecimal overdueRate = BigDecimal.ZERO;
int s = 0;
int e = 0;
if(getZzzyfModeenum().equals(zzzyfModeEnum.rate)){//统一费率
......@@ -719,6 +720,10 @@ public class dcSettleUtil {
TFProtocolEntryE7Collection e7Coll = getE7Coll();
if(e7Coll.size()>0){
rate = e7Coll.get(0).getRate();
overdueRate = e7Coll.get(0).getOverdueRate();
if (overdueRate == null) {
overdueRate = BigDecimal.ZERO;
}
zqTypeMode type = e7Coll.get(0).getSettleDateType();
if(type !=null && type.equals(zqTypeMode.day) ){
str = rate + "/100";
......@@ -735,6 +740,7 @@ public class dcSettleUtil {
v.put("dzAmount", amount.multiply(rate).multiply(new BigDecimal(diffDay+"")).setScale(10,RoundingMode.HALF_UP));//垫资金额
v.put("rate", rate);//统一日费率
v.put("overdueRate", overdueRate);//超期费率
v.put("isOk","1");
v.put("getValueWay","无");
v.put("message",message);
......@@ -871,6 +877,13 @@ public class dcSettleUtil {
}
return v ;
}
public BigDecimal getOverDueRate(HashMap<String, Object> map){
BigDecimal v = BigDecimal.ZERO;
if(map.get("overdueRate")!=null){
v = (BigDecimal) map.get("overdueRate");
}
return v ;
}
public int getDzAmountDay(HashMap<String, Object> map){
int v = 0 ;
if(map.get("jxdateDiff")!=null){
......
......@@ -1584,6 +1584,39 @@ public class AbstractPrincipalInfo extends com.kingdee.eas.hse.common.SCSBillBas
{
setString("remark", item);
}
/**
* Object:委托方's 用户中心IDproperty
*/
public String getUCID()
{
return getString("UCID");
}
public void setUCID(String item)
{
setString("UCID", item);
}
/**
* Object:委托方's 用户IDproperty
*/
public String getUserID()
{
return getString("UserID");
}
public void setUserID(String item)
{
setString("UserID", item);
}
/**
* Object:委托方's 发票IDproperty
*/
public String getInvoiceID()
{
return getString("InvoiceID");
}
public void setInvoiceID(String item)
{
setString("InvoiceID", item);
}
public BOSObjectType getBOSType()
{
return new BOSObjectType("A81865FD");
......
......@@ -107,6 +107,17 @@ public class AbstractTFProtocolEntryE7Info extends com.kingdee.eas.framework.Cor
{
put("serProject", item);
}
/**
* Object:资金占用费统一费率's 超期费率property
*/
public java.math.BigDecimal getOverdueRate()
{
return getBigDecimal("overdueRate");
}
public void setOverdueRate(java.math.BigDecimal item)
{
setBigDecimal("overdueRate", item);
}
public BOSObjectType getBOSType()
{
return new BOSObjectType("40C05CE9");
......
......@@ -2,11 +2,9 @@ package com.kingdee.eas.hse.scm.business.app;
import java.sql.SQLException;
import java.util.Date;
import java.util.HashMap;
import org.apache.log4j.Logger;
import com.alibaba.fastjson.JSONObject;
import com.kingdee.bos.BOSException;
import com.kingdee.bos.Context;
import com.kingdee.bos.dao.IObjectCollection;
......@@ -18,10 +16,6 @@ import com.kingdee.bos.ui.face.UIRuleUtil;
import com.kingdee.eas.base.permission.UserInfo;
import com.kingdee.eas.camel.app.XZAppUtil;
import com.kingdee.eas.common.EASBizException;
import com.kingdee.eas.custom.BillUtil;
import com.kingdee.eas.custom.log.MessageSendUtil;
import com.kingdee.eas.custom.newbill.HproseDockingFacadeFactory;
import com.kingdee.eas.custom.newbill.app.synType;
import com.kingdee.eas.framework.BillBaseException;
import com.kingdee.eas.framework.CoreBaseInfo;
import com.kingdee.eas.framework.Result;
......@@ -126,32 +120,6 @@ public class TFProtocolControllerBean extends AbstractTFProtocolControllerBean {
if (tFProtocolInfo.getId() == null)
throw new BillBaseException(BillBaseException.NOEXIST);
super.update(ctx, pk, tFProtocolInfo);
if (tFProtocolInfo != null) {
//富开组织
String type = "7";
if("LxYAAAACagTM567U".equals(tFProtocolInfo.getAcceptCompany().getString("id"))) {
type = "9";
}
JSONObject json = BillUtil.getUnAuditProtocalJson(ctx, tFProtocolInfo.getId().toString(), tFProtocolInfo.getPrincal().getId().toString(), type);
if (json != null && json.get("0000") != null) {
logger.error("反审核服务协议json:" + json);
HashMap<String, String> map = HproseDockingFacadeFactory.getLocalInstance(ctx).pubRunConnHp("", json.toString(), "erpSynDelServiceAgreement");
if (map.get("0000") == null) {
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIA);
BillUtil.insertSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIR, map.get("4444"));
logger.error("推送服务协议记录至平台失败:" + map.get("4444"));
try {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo("服务协议[" + tFProtocolInfo.getNumber() + "][反审核]同步至平台失败,操作人[" + XZAppUtil.getPersonInfo(ctx).getName()
+ "],失败原因:" + map.get("4444"), "业务负责人1", "开发负责人1"), 1).PostData();
} catch (Exception e1) {
throw new BOSException(e1);
}
} else {// 成功
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIR);
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIA);
}
}
}
}
}
......@@ -240,30 +208,6 @@ public class TFProtocolControllerBean extends AbstractTFProtocolControllerBean {
if (tFProtocolInfo.getId() == null)
throw new BillBaseException(BillBaseException.NOEXIST);
super.update(ctx, pk, tFProtocolInfo);
String type = "7";
if("LxYAAAACagTM567U".equals(tFProtocolInfo.getAcceptCompany().getString("id"))) {
type = "9";
}
JSONObject json = BillUtil.getProtocolJson(ctx, tFProtocolInfo.getId().toString(), tFProtocolInfo.getPrincal().getId().toString(), type);
if (json != null && json.get("0000") != null) {
logger.error("推送服务协议json:" + json);
String function = "erpSyncServiceAgreement";
HashMap<String, String> map = HproseDockingFacadeFactory.getLocalInstance(ctx).pubRunConnHp("", json.toString(), function);
if (map.get("0000") == null) { // 访问接口失败
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIR);
BillUtil.insertSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIA, map.get("4444"));
logger.error("推送服务协议记录至平台失败:" + map.get("4444"));
try {
new MessageSendUtil.dingtalkUtil(ctx, MessageSendUtil.createMsgInfo("服务协议[" + tFProtocolInfo.getNumber() + "][审核]同步至平台失败,操作人[" + XZAppUtil.getPersonInfo(ctx).getName()
+ "],失败原因:" + map.get("4444"), "业务负责人1", "开发负责人1"), 1).PostData();
} catch (Exception e1) {
throw new BOSException(e1);
}
} else {// 推送成功
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIR);
BillUtil.delSynErrorInfo(ctx, tFProtocolInfo.getId().toString(), synType.FWXIA);
}
}
}
}
......
......@@ -57,7 +57,9 @@ contcontactPhone.boundLabelText=\u8054\u7CFB\u7535\u8BDD
contChangeDate.boundLabelText=\u53D8\u66F4\u65E5\u671F
chkisRelationCustomer.text=\u662F\u5426\u5173\u8054\u5BA2\u6237
chkisRelationSupplier.text=\u662F\u5426\u5173\u8054\u4F9B\u5E94\u5546
contLongNote.boundLabelText=\u957F\u671F\u5907\u6CE8
contUCID.boundLabelText=\u7528\u6237\u4E2D\u5FC3ID
contUserID.boundLabelText=\u7528\u6237ID
contInvoiceID.boundLabelText=\u53D1\u7968ID
kDPanel2.constraints=\u8D22\u52A1\u8D44\u6599
kDContainer11.title=\u7ECF\u8425\u72B6\u51B5
contySalesIncome.boundLabelText=\u5E74\u9500\u552E\u6536\u5165(\u4E07\u5143)
......@@ -254,8 +256,6 @@ contexportCount.boundLabelText=\u5165\u53E3\u7C7B\u578B
contorigBillId.boundLabelText=\u539F\u59CB\u670D\u52A1\u5355\u636EID
txtorigBillId.text=
chkisDoubleTaitou.text=\u662F\u5426\u53CC\u62AC\u5934
contcrmCustomserID.boundLabelText=CRM\u5BA2\u6237ID
contCustomerSource.boundLabelText=\u5BA2\u6237\u6765\u6E90
chksingleHeader.text=\u5F3A\u5236\u5355\u62AC\u5934
chkdoubleHeader.text=\u5F3A\u5236\u53CC\u62AC\u5934
contcooperType.boundLabelText=\u5408\u4F5C\u6A21\u677F
......
......@@ -57,7 +57,9 @@ contcontactPhone.boundLabelText=\u8054\u7CFB\u7535\u8BDD
contChangeDate.boundLabelText=\u53D8\u66F4\u65E5\u671F
chkisRelationCustomer.text=\u662F\u5426\u5173\u8054\u5BA2\u6237
chkisRelationSupplier.text=\u662F\u5426\u5173\u8054\u4F9B\u5E94\u5546
contLongNote.boundLabelText=\u957F\u671F\u5907\u6CE8
contUCID.boundLabelText=\u7528\u6237\u4E2D\u5FC3ID
contUserID.boundLabelText=\u7528\u6237ID
contInvoiceID.boundLabelText=\u53D1\u7968ID
kDPanel2.constraints=\u8D22\u52A1\u8D44\u6599
kDContainer11.title=\u7ECF\u8425\u72B6\u51B5
contySalesIncome.boundLabelText=\u5E74\u9500\u552E\u6536\u5165(\u4E07\u5143)
......@@ -254,8 +256,6 @@ contexportCount.boundLabelText=\u5165\u53E3\u7C7B\u578B
contorigBillId.boundLabelText=\u539F\u59CB\u670D\u52A1\u5355\u636EID
txtorigBillId.text=
chkisDoubleTaitou.text=\u662F\u5426\u53CC\u62AC\u5934
contcrmCustomserID.boundLabelText=CRM\u5BA2\u6237ID
contCustomerSource.boundLabelText=\u5BA2\u6237\u6765\u6E90
chksingleHeader.text=\u5F3A\u5236\u5355\u62AC\u5934
chkdoubleHeader.text=\u5F3A\u5236\u53CC\u62AC\u5934
contcooperType.boundLabelText=\u5408\u4F5C\u6A21\u677F
......
......@@ -57,7 +57,9 @@ contcontactPhone.boundLabelText=\u806F\u7E6B\u96FB\u8A71
contChangeDate.boundLabelText=\u8B8A\u66F4\u65E5\u671F
chkisRelationCustomer.text=\u662F\u5426\u95DC\u806F\u5BA2\u6236
chkisRelationSupplier.text=\u662F\u5426\u95DC\u806F\u4F9B\u61C9\u5546
contLongNote.boundLabelText=\u9577\u671F\u5099\u8A3B
contUCID.boundLabelText=\u7528\u6236\u4E2D\u5FC3ID
contUserID.boundLabelText=\u7528\u6236ID
contInvoiceID.boundLabelText=\u767C\u7968ID
kDPanel2.constraints=\u8CA1\u52D9\u8CC7\u6599
kDContainer11.title=\u7D93\u71DF\u72C0\u6CC1
contySalesIncome.boundLabelText=\u5E74\u92B7\u552E\u6536\u5165(\u842C\u5143)
......@@ -253,8 +255,6 @@ contprintCount.boundLabelText=\u5217\u5370\u6B21\u6578
contexportCount.boundLabelText=\u5165\u53E3\u985E\u578B
contorigBillId.boundLabelText=\u539F\u59CB\u670D\u52D9\u55AE\u64DAID
chkisDoubleTaitou.text=\u662F\u5426\u96D9\u62AC\u982D
contcrmCustomserID.boundLabelText=CRM\u5BA2\u6236ID
contCustomerSource.boundLabelText=\u5BA2\u6236\u4F86\u6E90
chksingleHeader.text=\u5F37\u5236\u55AE\u62AC\u982D
chkdoubleHeader.text=\u5F37\u5236\u96D9\u62AC\u982D
contcooperType.boundLabelText=\u5408\u4F5C\u7BC4\u672C
......
......@@ -203,13 +203,14 @@ kdtE6.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http
kDPanel8.constraints=\u8D44\u91D1\u5360\u7528\u8D39\u7EDF\u4E00\u8D39\u7387
kdtE7.seq=\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7
kdtE7.settlementType=\u7ED3\u7B97\u65B9\u5F0F
kdtE7.overdueRate=\u8D85\u671F\u8D39\u7387%
kdtE7.rate=\u8D39\u7387%
kdtE7.effDay=\u751F\u6548\u65E5\u671F
kdtE7.expiryDate=\u5931\u6548\u65E5\u671F
kdtE7.remarks=\u5907\u6CE8
kdtE7.settleDateType=\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B
kdtE7.serProject=\u8BA1\u8D39\u9879\u76EE
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol2"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol4" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7</t\:Cell><t\:Cell>\u7ED3\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8D39\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5907\u6CE8</t\:Cell><t\:Cell>\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B</t\:Cell><t\:Cell>\u8BA1\u8D39\u9879\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol5"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="overdueRate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="2" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="3" t\:styleID\="sCol3" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="4" t\:styleID\="sCol4" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="5" t\:styleID\="sCol5" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="6" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="7" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="8" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7</t\:Cell><t\:Cell>\u7ED3\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8D85\u671F\u8D39\u7387%</t\:Cell><t\:Cell>\u8D39\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5907\u6CE8</t\:Cell><t\:Cell>\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B</t\:Cell><t\:Cell>\u8BA1\u8D39\u9879\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
btnAudit.text=\u5BA1\u6838
btnUnAudit.text=\u53CD\u5BA1\u6838
btnPaperManage.text=\u5355\u8BC1\u7BA1\u7406
......
......@@ -203,13 +203,14 @@ kdtE6.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http
kDPanel8.constraints=\u8D44\u91D1\u5360\u7528\u8D39\u7EDF\u4E00\u8D39\u7387
kdtE7.seq=\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7
kdtE7.settlementType=\u7ED3\u7B97\u65B9\u5F0F
kdtE7.overdueRate=\u8D85\u671F\u8D39\u7387%
kdtE7.rate=\u8D39\u7387%
kdtE7.effDay=\u751F\u6548\u65E5\u671F
kdtE7.expiryDate=\u5931\u6548\u65E5\u671F
kdtE7.remarks=\u5907\u6CE8
kdtE7.settleDateType=\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B
kdtE7.serProject=\u8BA1\u8D39\u9879\u76EE
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol2"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol4" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7</t\:Cell><t\:Cell>\u7ED3\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8D39\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5907\u6CE8</t\:Cell><t\:Cell>\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B</t\:Cell><t\:Cell>\u8BA1\u8D39\u9879\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol5"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="overdueRate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="2" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="3" t\:styleID\="sCol3" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="4" t\:styleID\="sCol4" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="5" t\:styleID\="sCol5" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="6" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="7" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="8" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u5355\u636E\u5206\u5F55\u5E8F\u5217\u53F7</t\:Cell><t\:Cell>\u7ED3\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8D85\u671F\u8D39\u7387%</t\:Cell><t\:Cell>\u8D39\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5907\u6CE8</t\:Cell><t\:Cell>\u7ED3\u7B97\u65E5\u671F\u7C7B\u578B</t\:Cell><t\:Cell>\u8BA1\u8D39\u9879\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
btnAudit.text=\u5BA1\u6838
btnUnAudit.text=\u53CD\u5BA1\u6838
btnPaperManage.text=\u5355\u8BC1\u7BA1\u7406
......
......@@ -203,13 +203,14 @@ kdtE6.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http
kDPanel8.constraints=\u8CC7\u91D1\u4F54\u7528\u8CBB\u7D71\u4E00\u8CBB\u7387
kdtE7.seq=\u55AE\u64DA\u5206\u9304\u5E8F\u5217\u865F
kdtE7.settlementType=\u7D50\u7B97\u65B9\u5F0F
kdtE7.overdueRate=\u8D85\u671F\u8CBB\u7387%
kdtE7.rate=\u8CBB\u7387%
kdtE7.effDay=\u751F\u6548\u65E5\u671F
kdtE7.expiryDate=\u5931\u6548\u65E5\u671F
kdtE7.remarks=\u5099\u8A3B
kdtE7.settleDateType=\u7D50\u7B97\u65E5\u671F\u985E\u578B
kdtE7.serProject=\u8A08\u8CBB\u9805\u76EE
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol2"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol2" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol3" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol4" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u55AE\u64DA\u5206\u9304\u5E8F\u5217\u865F</t\:Cell><t\:Cell>\u7D50\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8CBB\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5099\u8A3B</t\:Cell><t\:Cell>\u7D50\u7B97\u65E5\u671F\u985E\u578B</t\:Cell><t\:Cell>\u8A08\u8CBB\u9805\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
kdtE7.formatXml=<?xml version\="1.0" encoding\="UTF-8"?><DocRoot xmlns\:c\="http\://www.kingdee.com/Common" xmlns\:f\="http\://www.kingdee.com/Form" xmlns\:t\="http\://www.kingdee.com/Table" xmlns\:xsi\="http\://www.w3.org/2001/XMLSchema-instance" xsi\:schemaLocation\="http\://www.kingdee.com/KDF KDFSchema.xsd" version\="0.0"><Styles><c\:Style id\="sCol0"><c\:NumberFormat>&amp;int</c\:NumberFormat></c\:Style><c\:Style id\="sCol3"><c\:NumberFormat>&amp;double</c\:NumberFormat></c\:Style><c\:Style id\="sCol4"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style><c\:Style id\="sCol5"><c\:NumberFormat>&amp;date</c\:NumberFormat></c\:Style></Styles><Table id\="KDTable"><t\:Sheet name\="sheet1"><t\:Table t\:selectMode\="15" t\:mergeMode\="0" t\:dataRequestMode\="0" t\:pageRowCount\="100"><t\:ColumnGroup><t\:Column t\:key\="seq" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" t\:styleID\="sCol0" /><t\:Column t\:key\="settlementType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="-1" /><t\:Column t\:key\="overdueRate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="2" /><t\:Column t\:key\="rate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="3" t\:styleID\="sCol3" /><t\:Column t\:key\="effDay" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="4" t\:styleID\="sCol4" /><t\:Column t\:key\="expiryDate" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="5" t\:styleID\="sCol5" /><t\:Column t\:key\="remarks" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="6" /><t\:Column t\:key\="settleDateType" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="7" /><t\:Column t\:key\="serProject" t\:width\="-1" t\:mergeable\="true" t\:resizeable\="true" t\:moveable\="true" t\:group\="false" t\:required\="false" t\:index\="8" /></t\:ColumnGroup><t\:Head><t\:Row t\:name\="header" t\:height\="-1" t\:mergeable\="true" t\:resizeable\="true"><t\:Cell>\u55AE\u64DA\u5206\u9304\u5E8F\u5217\u865F</t\:Cell><t\:Cell>\u7D50\u7B97\u65B9\u5F0F</t\:Cell><t\:Cell>\u8D85\u671F\u8CBB\u7387%</t\:Cell><t\:Cell>\u8CBB\u7387%</t\:Cell><t\:Cell>\u751F\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5931\u6548\u65E5\u671F</t\:Cell><t\:Cell>\u5099\u8A3B</t\:Cell><t\:Cell>\u7D50\u7B97\u65E5\u671F\u985E\u578B</t\:Cell><t\:Cell>\u8A08\u8CBB\u9805\u76EE</t\:Cell></t\:Row></t\:Head></t\:Table><t\:SheetOptions><t\:MergeBlocks><t\:Head /></t\:MergeBlocks></t\:SheetOptions></t\:Sheet></Table></DocRoot>
btnAudit.text=\u5BE9\u6838
btnUnAudit.text=\u53CD\u5BE9\u6838
btnPaperManage.text=\u55AE\u8B49\u7BA1\u7406
......
......@@ -102,6 +102,10 @@ public class PrincipalEditUI extends AbstractPrincipalEditUI {
public PrincipalEditUI() throws Exception {
super();
dataBinder.registerBinding("auditor", com.kingdee.eas.base.permission.UserInfo.class, this.prmtAuditor, "data");
dataBinder.registerBinding("UCID", String.class, this.txtUCID, "text");
dataBinder.registerBinding("UserID", String.class, this.txtUserID, "text");
dataBinder.registerBinding("InvoiceID", String.class, this.txtInvoiceID, "text");
}
public void loadFields() {
......@@ -139,7 +143,7 @@ public class PrincipalEditUI extends AbstractPrincipalEditUI {
if (owner instanceof PrincipalListUI) {
principalListUI = (PrincipalListUI) owner;
}
contcrmCustomserID.setVisible(false);
// contcrmCustomserID.setVisible(false);
kdtContact.getColumn("other").getStyleAttributes().setHided(true);
btnSubmit.setVisible(false);
......@@ -311,6 +315,10 @@ public class PrincipalEditUI extends AbstractPrincipalEditUI {
prmtentType.setRequired(true);
addBusinessInfoBtn();
this.txtUCID.setRequired(true);
this.txtUserID.setRequired(true);
this.txtInvoiceID.setRequired(true);
}
/**
......
......@@ -205,20 +205,9 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean
default:
break;
}
// 长期备注
// PrincipalInfo principal = info.getPrincipal();
// String nongNote = info.getLongNote();
// if (!DCUtil.emptyToValue(nongNote, "").equals(DCUtil.emptyToValue(principal.getLongNote(), ""))) {
// IPrincipal iPrincipal = PrincipalFactory.getLocalInstance(ctx);
// principal.setLongNote(nongNote);
// iPrincipal.updatePartial(principal, DCUtil.getSeletor("longNote"));
// }
// 执行采购显示外汇牌价,代理采购显示海关汇率
setCustomsAndExRate(ctx, info);
// 校验订单实体名单
// EntityListUtil.checkBillEntity(ctx, info);
IObjectPK pk = super._save(ctx, model);
EntrustBillLogic logic = new EntrustBillLogic(model, pk.toString());
Map mapReturn = new HashMap();
......@@ -349,15 +338,11 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean
EntrustBillInfo info = (EntrustBillInfo) model;
checkEntrustNo(ctx, info);
info.setBillStatus(HSEBillStatusEnum.SUBMITED);
// EntityListUtil.checkBillEntity(ctx, info);
// logger.error("委托单开始提交" + info.getNumber());
if (info.getBillStatus().equals(HSEBillStatusEnum.ADJUSTING)) {
throw new EASBizException(new NumericExceptionSubItem("0xF10000D8", Resource.getString("0xF10000D8")));
}
// 校验型号是否属于管制品
// checkCompanyNature(ctx, info);
// checkAddress(ctx, info);
// checkMaterial2(ctx, info);
setOrigBillId(model);
switch (activeServiceFlag) {
......@@ -698,7 +683,7 @@ public class EntrustBillControllerBean extends AbstractEntrustBillControllerBean
arTotal = invoiceAmount.subtract(totalAmount);
}
} else if (number.contains("ACI")) { // 普通采购
rate = getCustomsRate(ctx, currencyId, rmbId, info.getBizDate());// 海关汇率
rate = getRemoteExRateDay(ctx, currencyId, rmbId, date, forExRate.卖出价);// 外汇牌价
for (int i = 0; i < info.getClassifyEntrys().size(); i++) {
EntrustBillClassifyEntryInfo cfyInfo = info.getClassifyEntrys().get(i);
BigDecimal amount = DCUtil.emptyToValue(cfyInfo.getAmount2(), BigDecimal.ZERO);
......
......@@ -554,17 +554,6 @@ public class EntrustBillEditUI extends AbstractEntrustBillEditUI {
SysUtil.abort();
}
if (kdtClassifyEntrys.getRowCount() > 0) {
for (int i = 0, l = kdtClassifyEntrys.getRowCount(); i < l; i++) {
if(this.entranceType == 4) {
PrincipalInfo principal = (PrincipalInfo)prmtprincipal.getValue();
Object supplier_kj = DCUtil.getCellValue(kdtClassifyEntrys, i, "supplier_kj");
if(("ilu4qBD9TVe45q9odJ7rxqgYZf0=".equals(principal.getString("id")) || "BPHXI23KQ26AHHh2lv12GqgYZf0=".equals(principal.getString("id"))) && UIRuleUtil.isNull(supplier_kj)) {
MsgBox.showInfo("第" + (i + 1) + "行,科技供应商为空,不能提交");
SysUtil.abort();
}
}
setEmpty(i);
}
if (entranceType == 9) {
for (int i = 0; i < kdtClassifyEntrys.getRowCount(); i++) {
kdtClassifyEntrys.getCell(i, "isDeclare").setValue(false);
......@@ -589,22 +578,12 @@ public class EntrustBillEditUI extends AbstractEntrustBillEditUI {
EntityViewInfo view2 = new EntityViewInfo();
String model = (String) kdtClassifyEntrys.getCell(i, "model").getValue();
String manufacturer = ((String) kdtClassifyEntrys.getCell(i, "manufacturer").getValue()).toUpperCase();
String isStartBrandMatch = DCUtil.getInitSysValueByParamNumber(null, "isStartBrandMatch");
if ("true".equals(isStartBrandMatch)) {
if (!BrandFactory.getRemoteInstance().exists("where number = '" + manufacturer + "' and Status = 1")) {
BrandMatchMatchEntryCollection coll = BrandMatchMatchEntryFactory.getRemoteInstance().getBrandMatchMatchEntryCollection(
"select parent.brand.* where matchField = '" + manufacturer + "'");
if (!coll.isEmpty()) {
manufacturer = coll.get(0).getParent().getBrand().getNumber();
DCUtil.setCellValue(kdtClassifyEntrys, i, "manufacturer", manufacturer);
} else {
MsgBox.showWarning("第" + (i + 1) + "行分录'品牌'在品牌库 中不存在或为启用,请确认品牌是否正确或联系关务协助添加!");
kdtClassifyEntrys.getEditManager().editCellAt(i, kdtClassifyEntrys.getColumnIndex("manufacturer"));
SysUtil.abort();
}
}
if (!BrandFactory.getRemoteInstance().exists("where number = '" + manufacturer + "' and Status = 1")) {
MsgBox.showWarning("第" + (i + 1) + "行分录'品牌'在品牌库 中不存在或为启用,请确认品牌是否正确或联系关务协助添加!");
kdtClassifyEntrys.getEditManager().editCellAt(i, kdtClassifyEntrys.getColumnIndex("manufacturer"));
SysUtil.abort();
}
String productName = (String) kdtClassifyEntrys.getCell(i, "productName").getValue();
FilterInfo filter = new FilterInfo();
filter.getFilterItems().add(new FilterItemInfo("model", model));
......
......@@ -7,7 +7,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import com.kingdee.bos.BOSException;
......@@ -20,13 +19,8 @@ import com.kingdee.eas.common.EASBizException;
import com.kingdee.eas.custom.newbill.ArVerificationRecordEntryInfo;
import com.kingdee.eas.custom.newbill.ArVerificationRecordFactory;
import com.kingdee.eas.custom.newbill.ArVerificationRecordInfo;
import com.kingdee.eas.custom.scm.arapverify.ArApVerifyBillFactory;
import com.kingdee.eas.custom.scm.arapverify.IArApVerifyBill;
import com.kingdee.eas.hse.common.util.DCUtil;
import com.kingdee.eas.hse.common.util.ReverseLogic;
import com.kingdee.eas.hse.scm.settlemanager.ArChargeSettleFactory;
import com.kingdee.eas.hse.scm.settlemanager.ArChargeSettleInfo;
import com.kingdee.eas.hse.scm.settlemanager.IArChargeSettle;
import com.kingdee.eas.hse.scm.settlemanager.RPWriteOffBillInfo;
import com.kingdee.eas.hse.scm.settlemanager.RPWriteOffBillWriteOffDetailCollection;
import com.kingdee.eas.hse.scm.settlemanager.RPWriteOffBillWriteOffDetailInfo;
......@@ -47,47 +41,6 @@ public class RPWriteOffBillControllerBeanEx extends RPWriteOffBillControllerBean
logic.update();
logic.setPlan(27);
logic.update();
// // 是否启用自动核销功能
// String isVerifySCMRec = DCUtil.getInitSysValueByParamNumber(ctx, "isVerifySCMRec");
// if (!"true".equals(isVerifySCMRec)) {
// return;
// }
// // 核销财务账 应收
// StringBuffer sql = XZUtil.appendSQL();
// sql.append("select arBillID").append(" \n");
// sql.append(" from (select b.FParentID arBillID").append(" \n");
// sql.append(" from CT_SM_RPWOBWOS a").append(" \n");
// sql.append(" left join CT_SM_ArChargeSettleE1 b on a.FFeepoolID = b.FFeepoolID").append(" \n");
// sql.append(" where nvl(b.CFUnverifyAmt, 0) != 0").append(" \n");
// sql.append(" and a.CFTServeProjectID not in").append(" \n");
// sql.append(" ('crYAAAJeQD6Ib4YR', 'crYAAAJeQECIb4YR')").append(" \n");
// sql.append(" and a.FParentID = '"+info.getId()+"'").append(" \n");
// sql.append(" union all").append(" \n");
// sql.append(" select b.FParentID arBillID").append(" \n");
// sql.append(" from CT_SM_RPWOBWOS a").append(" \n");
// sql.append(" left join CT_SM_ArChargeSettleE1 b on a.CFEntrustNumber = b.CFShareNumber").append(" \n");
// sql.append(" where nvl(b.CFUnverifyAmt, 0) != 0").append(" \n");
// sql.append(" and a.CFTServeProjectID in ('crYAAAJeQD6Ib4YR', 'crYAAAJeQECIb4YR')").append(" \n");
// sql.append(" and b.FServeProjectID = 'crYAAAJebpCIb4YR'").append(" \n");
// sql.append(" and a.FParentID = '"+info.getId()+"')").append(" \n");
// sql.append(" group by arBillID").append(" \n");
// IRowSet rs = DbUtil.executeQuery(ctx, sql.toString());
// try {
// HashSet<String> arBillIds = new HashSet<String>();
// while(rs.next()) {
// arBillIds.add(rs.getString("arBillID"));
// }
// if (!arBillIds.isEmpty()) {
// IArChargeSettle iArChargeSettle = ArChargeSettleFactory.getLocalInstance(ctx);
// IArApVerifyBill iArApVerifyBill = ArApVerifyBillFactory.getLocalInstance(ctx);
// for(String arBillId : arBillIds) {
// ArChargeSettleInfo arBillInfo = iArChargeSettle.getArChargeSettleInfo("select *, company.*, E1.*, E1.serveProject.* where id = '" + arBillId + "' and BillStatus = 6");
// iArApVerifyBill.autoVerifySCMRec(arBillInfo);
// }
// }
// } catch (SQLException e) {
// throw new BOSException(e);
// }
}
/**
......@@ -282,7 +235,7 @@ public class RPWriteOffBillControllerBeanEx extends RPWriteOffBillControllerBean
}
recordInfo.getEntrys().add(entryInfo);
}
@Override
public void _unAudit(Context ctx, IObjectPK pk, IObjectValue model) throws BOSException, EASBizException {
super._unAudit(ctx, pk, model);
......
......@@ -224,6 +224,8 @@ public class ArChargeSettleEditUI extends AbstractArChargeSettleEditUI
EntityViewInfo view = XZUtil.getEntityViewInfo("id", "WTF9527");
XZClientUtil.registerTableF7(kdtE1, "invoiceCustomer", "com.kingdee.eas.basedata.master.cssp.app.F7CustomerQuery", view);
}
this.kdZddlf.setVisible(false);
}
protected void prmtPrincipal_dataChanged(DataChangeEvent e) throws Exception{
......@@ -2964,55 +2966,14 @@ public class ArChargeSettleEditUI extends AbstractArChargeSettleEditUI
}
info.setSettlementCurrency(SettlementCurrency);//结算币别
if("99".equals(editData.getBizFlow().getNumber())){//本港单
//汇率取对应本港单的汇率
try {
BigDecimal rate = BigDecimal.ONE;
if(!info.getOrginCurrency().getId().equals(SettlementCurrency.getId())){
rate = DCUtil.getHKExchangeRate(null, info.getOrginCurrency(), SettlementCurrency, detailInfo.getDate("ebFBizdate"));
}
info.setExchangeRate(rate);
info.setSettlementAmount(orignAmount.multiply(rate));
info.setTTLAmount(orignAmount.multiply(rate));
info.setAdjSAT(BigDecimal.ZERO);
} catch (Exception e) {}
} else {
//如果结算币别和当前本位相等直接取,不然去财务汇率
if(SettlementCurrency.equals(baseCurrency) && !info.getServeProject().getNumber().equals(DCConstant.serviceProjectGoodAmount)){
info.setExchangeRate(detailInfo.getBigDecimal("FRate"));
info.setSettlementAmount(SettleAmount);
info.setTTLAmount(SettleAmount);
info.setAdjSAT(BigDecimal.ZERO);
} else {//如果是货值是否要计算汇率 先取财务汇率
if(detailInfo.getString("FOrgCurrencyID").equals(SettlementCurrency.getId().toString())){//原币和计算币别相等
BigDecimal newRate = BigDecimal.ONE;
info.setExchangeRate(newRate);
info.setSettlementAmount(orignAmount.multiply(newRate));
info.setTTLAmount(orignAmount.multiply(newRate));
info.setAdjSAT(BigDecimal.ZERO);
} else{
if ("13".equals(editData.getBizFlow().getNumber()) && !detailInfo.getString("FOrgCurrencyID").equals(SettlementCurrency.getId().toString())) {
BigDecimal rate = BigDecimal.ONE;
try {
rate = DCUtil.getCustomsRate(null, detailInfo.getString("FOrgCurrencyID"), detailInfo.getDate("ebFBizdate"));
} catch (Exception e) {
e.printStackTrace();
}
// 海关汇率
info.setExchangeRate(rate);
info.setSettlementAmount(orignAmount.multiply(rate));
info.setTTLAmount(orignAmount.multiply(rate));
info.setAdjSAT(BigDecimal.ZERO);
} else {
BigDecimal rate = DCUtil.gethseExRateDay(detailInfo.getString("FOrgCurrencyID"), SettlementCurrency.getId().toString(),detailInfo.getDate("ebFBizdate") , forExRate.卖出价);
info.setExchangeRate(rate);
info.setSettlementAmount(orignAmount.multiply(rate));
info.setTTLAmount(orignAmount.multiply(rate));
info.setAdjSAT(BigDecimal.ZERO);
}
}
}
{
BigDecimal rate = DCUtil.gethseExRateDay(detailInfo.getString("FOrgCurrencyID"), SettlementCurrency.getId().toString(),detailInfo.getDate("ebFBizdate") , forExRate.卖出价);
info.setExchangeRate(rate);
info.setSettlementAmount(orignAmount.multiply(rate));
info.setTTLAmount(orignAmount.multiply(rate));
info.setAdjSAT(BigDecimal.ZERO);
}
info.setBalanceAmount(detailInfo.getBigDecimal("FInnerOrgAmount"));
info.setTTLAmount(info.getSettlementAmount());
//设置默认值
......@@ -3121,7 +3082,7 @@ public class ArChargeSettleEditUI extends AbstractArChargeSettleEditUI
int sIndex = MsgBox.showConfirm2(Resource.getString("0xE0000071"));
if(sIndex != MsgBox.OK){
//kdddlf_actionPerformed(null);//代理费
kdZddlf_actionPerformed(null);//最低代理费
// kdZddlf_actionPerformed(null);//最低代理费
kdsj_actionPerformed(null);//税负
kddlf_actionPerformed(null);//分摊
}
......
......@@ -273,15 +273,19 @@ public class ArInterestsSettleEditUI extends AbstractArInterestsSettleEditUI {
String innerId = "";
BigDecimal dkAmtLine = BigDecimal.ZERO; // 垫款金额
BigDecimal dkAmtServiceLine = BigDecimal.ZERO; // 垫款服务费金额
BigDecimal dkAmtOverServiceLine = BigDecimal.ZERO; // 垫款服务费金额
BigDecimal dkAmtoverServiceLine = BigDecimal.ZERO; // 垫款超期服务费金额
String formula = ""; // 垫资计算公式
String formulaDkOver = "";
String formulaOver = "";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 0; i < kdtE3.getRowCount(); i++) {
boolean isJSDzfwf = true;// 是否计算最低垫资服务
dkAmtServiceLine = BigDecimal.ZERO;
dkAmtOverServiceLine = BigDecimal.ZERO;
dkAmtoverServiceLine = BigDecimal.ZERO;
formula = "";
formulaDkOver = "";
formulaOver = "";
innerId = (String) kdtE3.getCell(i, "keyId").getValue();//冲销对应的原ID
ScsfundPoolCollection sfpColl = ScsfundPoolFactory.getRemoteInstance().getScsfundPoolCollection("select *, serverProject.* where id = '" + innerId + "'");
......@@ -430,7 +434,7 @@ public class ArInterestsSettleEditUI extends AbstractArInterestsSettleEditUI {
isJSDzfwf = false;
} else {
overDay = DCUtil.daysBetween(d2, d1);
// d1 = d2;
d1 = d2;
}
} else if (d1.compareTo(d2) <= 0) {
if (isOverDay) {
......@@ -467,6 +471,11 @@ public class ArInterestsSettleEditUI extends AbstractArInterestsSettleEditUI {
kdtE3.getCell(i, "overGoodDzDay").setValue(BigDecimal.ZERO);
kdtE3.getCell(i, "overGoodDzRate").setValue(breakRate);
kdtE3.getCell(i, "overGoodDzAmount").setValue(BigDecimal.ZERO);
if (overDay > 0) {
dkAmtOverServiceLine = dkAmtLine.multiply(DzAmountRate).multiply(new BigDecimal(overDay + "")).setScale(DCUtil.getAmountPrecision(), RoundingMode.HALF_UP);
formulaDkOver = dkAmtLine+"*"+(DzAmountRate.multiply(new BigDecimal(100)).stripTrailingZeros())+"/100*"+overDay;
}
}
if (overDay > 0) {
......@@ -480,6 +489,9 @@ public class ArInterestsSettleEditUI extends AbstractArInterestsSettleEditUI {
if (dkAmtServiceLine.compareTo(BigDecimal.ZERO) > 0 || (dkAmtServiceLine.compareTo(BigDecimal.ZERO) < 0)) {// 固定账期存在提前回款
AddKdtE1ByE3Line(kdtE3.getRow(i), DCConstant.serviceProjectdzfwAmount, dkAmtServiceLine, formula);
}
if (dkAmtOverServiceLine.compareTo(BigDecimal.ZERO) > 0) {// 固定账期存在延期回款
AddKdtE1ByE3Line(kdtE3.getRow(i), DCConstant.serviceProjectdzfwAmount, dkAmtOverServiceLine, formulaDkOver);
}
if (dkAmtoverServiceLine.compareTo(BigDecimal.ZERO) != 0) {
AddKdtE1ByE3Line(kdtE3.getRow(i), DCConstant.serviceProjectdzwyAmount, dkAmtoverServiceLine, formulaOver);
}
......
......@@ -5,6 +5,7 @@ package com.kingdee.eas.hse.scm.settlemanager.client;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
......@@ -22,6 +23,7 @@ import com.kingdee.bos.ctrl.kdf.table.KDTIndexColumn;
import com.kingdee.bos.ctrl.kdf.table.KDTable;
import com.kingdee.bos.ctrl.kdf.table.foot.KDTFootManager;
import com.kingdee.bos.ctrl.kdf.util.style.Styles.HorizontalAlignment;
import com.kingdee.bos.ctrl.swing.KDWorkButton;
import com.kingdee.bos.dao.query.IQueryExecutor;
import com.kingdee.bos.metadata.IMetaDataPK;
import com.kingdee.bos.metadata.entity.EntityViewInfo;
......@@ -34,6 +36,7 @@ import com.kingdee.eas.basedata.master.cssp.SupplierInfo;
import com.kingdee.eas.basedata.org.CompanyOrgUnitInfo;
import com.kingdee.eas.camel.client.UpdateTitleUtil;
import com.kingdee.eas.common.client.SysContext;
import com.kingdee.eas.custom.GCFacadeFactory;
import com.kingdee.eas.framework.client.FrameWorkClientUtils;
import com.kingdee.eas.hse.common.HSEBillStatusEnum;
import com.kingdee.eas.hse.common.client.DcClientUtil;
......@@ -42,6 +45,7 @@ import com.kingdee.eas.hse.scm.settlemanager.ContratMadeE3Collection;
import com.kingdee.eas.hse.scm.settlemanager.ContratMadeE3Factory;
import com.kingdee.eas.hse.scm.settlemanager.ContratMadeE3Info;
import com.kingdee.eas.util.client.EASResource;
import com.kingdee.eas.util.client.MsgBox;
/**
* output class name
......@@ -77,9 +81,45 @@ public class ContratMadeListUI extends AbstractContratMadeListUI
UpdateTitleUtil.updateTitle2(kDLabelContainer7);
UpdateTitleUtil.updateTitle(tblMain, "entrustbillNumber");
addSynBtn();
}
@Override
/**
*
* @author 熊智
* @date 2024-5-22 下午03:00:03
*/
private void addSynBtn() {
KDWorkButton btnSynWBSystem = new KDWorkButton("同步韦伯系统");
this.toolBar.add(btnSynWBSystem);
btnSynWBSystem.setIcon(EASResource.getIcon("imgTbtn_syncpurview"));
btnSynWBSystem.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
try {
btnSynWBSystem_actionPerformed(e);
} catch (Exception exc) {
handUIException(exc);
}
}
});
}
/**
*
* @param e
* @author 熊智
* @date 2024-5-22 下午03:01:47
*/
protected void btnSynWBSystem_actionPerformed(ActionEvent e) throws Exception {
checkSelected();
int flag = MsgBox.showConfirm2("注意,订单同步后无法撤回修改,请确保此次同步的数据准确!");
if (flag == MsgBox.OK) {
String id = getSelectedKeyValue();
GCFacadeFactory.getRemoteInstance().updateSaleOrder(id);
}
}
@Override
protected IQueryExecutor getQueryExecutor(IMetaDataPK queryPK,
EntityViewInfo viewInfo) {
EntityViewInfo newview =(EntityViewInfo) viewInfo.clone();
......
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 sign in to comment