|
@@ -379,7 +379,6 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
|
|
|
@Override
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
|
-
|
|
|
//保存按钮
|
|
|
if(e.getSource() == getSaveCardBtn()){
|
|
|
Vector<Vector<Object>> vectors= getJlcardPanel().getBillModel().getDataVector();
|
|
@@ -427,9 +426,9 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
icheadvo.setCoperatorid(PubEnv.getPk_user());
|
|
|
//仓库ID
|
|
|
if("工装".equals(billtype)) {
|
|
|
- icheadvo.setCwarehouseid("1001V51000000000039Z");//仓库必填
|
|
|
+ icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
|
|
|
}else if("家装".equals(billtype)) {
|
|
|
- icheadvo.setCwarehouseid("1001V5100000000003A0");//仓库必填
|
|
|
+ icheadvo.setCwarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
|
|
|
}
|
|
|
icheadvo.setBoutretflag(UFBoolean.FALSE);//是否退回
|
|
|
icheadvo.setBsalecooppur(UFBoolean.FALSE); // 销售出是否已协同生成采购入
|
|
@@ -437,7 +436,8 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
icheadvo.setCbilltypecode("4C");
|
|
|
icheadvo.setBassetcard(UFBoolean.FALSE);
|
|
|
icheadvo.setCbiztypeid("1001V51000000000002V");//业务流程
|
|
|
- icheadvo.setCcustomerid("0001V510000000000AJH");//客户
|
|
|
+ String def1 = GetBaseDAOUtil.getJobbasfilDef1("prjcode");
|
|
|
+ icheadvo.setCcustomerid(def1);//客户
|
|
|
icheadvo.setCdptid(headvo.getPlandeptid());//部门
|
|
|
icheadvo.setFreplenishflag(UFBoolean.FALSE);
|
|
|
icheadvo.setPk_cubasdocC("0001V510000000000674");//客户基本档案
|
|
@@ -447,7 +447,6 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
aggvo.setParentVO(icheadvo);
|
|
|
GeneralBillItemVO[] itemvos = new GeneralBillItemVO[execsize];
|
|
|
Map<String, UFDouble> updatemap = new HashMap<>();
|
|
|
-
|
|
|
int k = 0;
|
|
|
for(int j = 0; j < vectors.size(); j++) {
|
|
|
Vector<Object> vector = (Vector<Object>)vectors.get(j);
|
|
@@ -482,11 +481,10 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
itemvo.setBtransasset(UFBoolean.FALSE);
|
|
|
itemvo.setBzgflag(UFBoolean.FALSE);
|
|
|
itemvo.setCbodybilltypecode("4C");
|
|
|
- // itemvo.setCbodywarehouseid("1001V5100000000003A1");
|
|
|
if("工装".equals(billtype)) {
|
|
|
- itemvo.setCbodywarehouseid("1001V51000000000039Z");//仓库必填
|
|
|
+ itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("GZ001"));//仓库必填
|
|
|
}else if("家装".equals(billtype)) {
|
|
|
- itemvo.setCbodywarehouseid("1001V5100000000003A0");//仓库必填
|
|
|
+ itemvo.setCbodywarehouseid(GetBaseDAOUtil.getstordocpk("JZ002"));//仓库必填
|
|
|
}
|
|
|
itemvo.setCfirstbillhid(pk_order);
|
|
|
itemvo.setCfirstbillbid(vector.get(34).toString());
|
|
@@ -496,7 +494,7 @@ public class ToSaleOutDialog extends UIDialog implements ActionListener,BillEdit
|
|
|
// icheadvo.setCinventoryid(pk_invmandoc);
|
|
|
itemvo.setCinventorycode(cmaterialcode);
|
|
|
itemvo.setCprojectid(cprojectid);
|
|
|
- itemvo.setCreceieveid("0001V510000000000AJH");//收货单位
|
|
|
+ itemvo.setCreceieveid(def1);//收货单位
|
|
|
itemvo.setCrowno(Integer.toString((k+1)*10));
|
|
|
itemvo.setCsourcebillhid(pk_order);
|
|
|
itemvo.setCsourcebillbid(vector.get(34).toString());
|