midsuit
/
bali-nusa-plugin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with EDII 

--HG--
branch : DEV-MMU
This commit is contained in:
hodianto 2019-07-24 14:09:25 +07:00
parent 4a0c6df077 c9602c2cce
commit f9951fde17
3 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrder.java
View File

@ -7,6 +7,7 @@ import org.compiere.model.MOrder;
import org.compiere.model.MOrderLine; import org.compiere.model.MOrderLine;
import org.compiere.model.MRMA; import org.compiere.model.MRMA;
import org.compiere.model.MRMALine; import org.compiere.model.MRMALine;
import org.compiere.model.MRequisition;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.process.ProcessInfoParameter; import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
@ -104,6 +105,7 @@ public class MID_TPBUpdateOrder extends SvrProcess{
private MOrder createPurchaseOrder(X_MID_UploadTPBLine line) { private MOrder createPurchaseOrder(X_MID_UploadTPBLine line) {
MOrder retValue = new MOrder(getCtx(), 0, get_TrxName()); MOrder retValue = new MOrder(getCtx(), 0, get_TrxName());
MRequisition req = new MRequisition(getCtx(), line.getM_Requisition_ID(), get_TrxName());
retValue.setAD_Org_ID(line.getAD_Org_ID()); retValue.setAD_Org_ID(line.getAD_Org_ID());
retValue.set_ValueNoCheck("NoAju1", line.getNoAju()); retValue.set_ValueNoCheck("NoAju1", line.getNoAju());
retValue.set_ValueNoCheck("RegisterDate", line.getRegisterDate()); retValue.set_ValueNoCheck("RegisterDate", line.getRegisterDate());
@ -122,6 +124,8 @@ public class MID_TPBUpdateOrder extends SvrProcess{
retValue.setC_DocTypeTarget_ID(line.getC_DocTypeTarget_ID()); retValue.setC_DocTypeTarget_ID(line.getC_DocTypeTarget_ID());
retValue.setIsSOTrx(false); retValue.setIsSOTrx(false);
retValue.setM_PriceList_ID(line.getM_PriceList_ID()); retValue.setM_PriceList_ID(line.getM_PriceList_ID());
retValue.setPaymentRule(req.get_ValueAsString("PaymentRule"));
retValue.setC_PaymentTerm_ID(req.get_ValueAsInt("C_PaymentTerm_ID"));
retValue.saveEx(); retValue.saveEx();
String message = Msg.parseTranslation(getCtx(), "@PurchaseOrderCreated@ " + retValue.getDocumentNo()); String message = Msg.parseTranslation(getCtx(), "@PurchaseOrderCreated@ " + retValue.getDocumentNo());
addBufferLog(retValue.get_ID(), retValue.getDateOrdered(), null, message, addBufferLog(retValue.get_ID(), retValue.getDateOrdered(), null, message,

4
andromeida.midsuit.project/src/andromedia/midsuit/process/MID_TPBUpdateOrderLine.java
View File

@ -7,6 +7,7 @@ import org.compiere.model.MOrder;
import org.compiere.model.MOrderLine; import org.compiere.model.MOrderLine;
import org.compiere.model.MRMA; import org.compiere.model.MRMA;
import org.compiere.model.MRMALine; import org.compiere.model.MRMALine;
import org.compiere.model.MRequisition;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.process.ProcessInfoParameter; import org.compiere.process.ProcessInfoParameter;
import org.compiere.process.SvrProcess; import org.compiere.process.SvrProcess;
@ -99,6 +100,7 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
private MOrder createPurchaseOrder(X_MID_UploadTPBLine line) { private MOrder createPurchaseOrder(X_MID_UploadTPBLine line) {
MOrder retValue = new MOrder(getCtx(), 0, get_TrxName()); MOrder retValue = new MOrder(getCtx(), 0, get_TrxName());
MRequisition req = new MRequisition(getCtx(), line.getM_Requisition_ID(), get_TrxName());
retValue.setAD_Org_ID(line.getAD_Org_ID()); retValue.setAD_Org_ID(line.getAD_Org_ID());
retValue.set_ValueNoCheck("NoAju1", line.getNoAju()); retValue.set_ValueNoCheck("NoAju1", line.getNoAju());
retValue.set_ValueNoCheck("RegisterDate", line.getRegisterDate()); retValue.set_ValueNoCheck("RegisterDate", line.getRegisterDate());
@ -117,6 +119,8 @@ public class MID_TPBUpdateOrderLine extends SvrProcess{
retValue.setC_DocTypeTarget_ID(line.getC_DocTypeTarget_ID()); retValue.setC_DocTypeTarget_ID(line.getC_DocTypeTarget_ID());
retValue.setIsSOTrx(false); retValue.setIsSOTrx(false);
retValue.setM_PriceList_ID(line.getM_PriceList_ID()); retValue.setM_PriceList_ID(line.getM_PriceList_ID());
retValue.setPaymentRule(req.get_ValueAsString("PaymentRule"));
retValue.setC_PaymentTerm_ID(req.get_ValueAsInt("C_PaymentTerm_ID"));
retValue.saveEx(); retValue.saveEx();
String message = Msg.parseTranslation(getCtx(), "@PurchaseOrderCreated@ " + retValue.getDocumentNo()); String message = Msg.parseTranslation(getCtx(), "@PurchaseOrderCreated@ " + retValue.getDocumentNo());
addBufferLog(retValue.get_ID(), retValue.getDateOrdered(), null, message, addBufferLog(retValue.get_ID(), retValue.getDateOrdered(), null, message,

35
andromeida.midsuit.project/src/andromedia/midsuit/validator/MID_OrderValidator.java
View File

@ -21,7 +21,6 @@ import org.compiere.model.MStorageOnHand;
import org.compiere.model.MWarehouse; import org.compiere.model.MWarehouse;
import org.compiere.model.PO; import org.compiere.model.PO;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.model.X_C_OrderLine;
import org.compiere.process.DocAction; import org.compiere.process.DocAction;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.osgi.service.event.Event; import org.osgi.service.event.Event;
@ -59,13 +58,16 @@ public class MID_OrderValidator {
MOrderLine[] lines = order.getLines(); MOrderLine[] lines = order.getLines();
if(order.get_ValueAsInt("MID_AJUDocumentType_ID")==0) if(order.get_ValueAsInt("MID_AJUDocumentType_ID")==0)
return ""; return "";
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
Timestamp regDate = (Timestamp) order.get_Value("RegisterDate");
int M_AttributeSetInstance_ID = DB.getSQLValue(order.get_TrxName(), "SELECT M_AttributeSetInstance_ID FROM M_AttributeSetInstance WHERE SerNo=?", new Object[] { order.get_ValueAsString("NoAju1") }); int M_AttributeSetInstance_ID = DB.getSQLValue(order.get_TrxName(), "SELECT M_AttributeSetInstance_ID FROM M_AttributeSetInstance WHERE SerNo=?", new Object[] { order.get_ValueAsString("RegisterNo")+"-"+dateFormat.format(new Date(regDate.getTime())) });
int M_AttributeSet_ID = DB.getSQLValue(order.get_TrxName(), "SELECT M_AttributeSet_ID FROM M_AttributeSet WHERE IsActive=? AND AD_Client_ID =? ", new Object[] { true, order.getAD_Client_ID() }); int M_AttributeSet_ID = DB.getSQLValue(order.get_TrxName(), "SELECT M_AttributeSet_ID FROM M_AttributeSet WHERE IsActive=? AND AD_Client_ID =? ", new Object[] { true, order.getAD_Client_ID() });
MAttributeSet aSet = new MAttributeSet(order.getCtx(), M_AttributeSet_ID, order.get_TrxName()); MAttributeSet aSet = new MAttributeSet(order.getCtx(), M_AttributeSet_ID, order.get_TrxName());
if(M_AttributeSetInstance_ID <=0) { if(M_AttributeSetInstance_ID <=0) {
MAttributeSetInstance ASI = new MAttributeSetInstance(order.getCtx(), 0, order.get_TrxName()); MAttributeSetInstance ASI = new MAttributeSetInstance(order.getCtx(), 0, order.get_TrxName());
ASI.setSerNo(order.get_ValueAsString("NoAju1")); ASI.setSerNo(order.get_ValueAsString("RegisterNo")+"-"+dateFormat.format(new Date(regDate.getTime())));
ASI.setMAttributeSet(aSet); ASI.setMAttributeSet(aSet);
ASI.setDescription(); ASI.setDescription();
ASI.saveEx(); ASI.saveEx();
@ -81,34 +83,13 @@ public class MID_OrderValidator {
.setParameters(new Object[] { line.getC_OrderLine_ID() }) .setParameters(new Object[] { line.getC_OrderLine_ID() })
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.list(); .list();
if(attLines.size()<=0) if(attLines.size()<=0) {
if(line.getM_AttributeSetInstance_ID()>0) {
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
Timestamp regDate = (Timestamp) line.get_Value("RegisterDate");
dateFormat.format(new Date(regDate.getTime()));
MAttributeSetInstance ASI = new MAttributeSetInstance(order.getCtx(), line.getM_AttributeSetInstance_ID(), order.get_TrxName());
ASI.setSerNo(line.get_ValueAsString("RegisterNo")+"-"+dateFormat.format(new Date(regDate.getTime())));
ASI.setDescription();
ASI.saveEx();
}else {
order.get_Logger().severe("MASUK SINI");
line.setM_AttributeSetInstance_ID(M_AttributeSetInstance_ID); line.setM_AttributeSetInstance_ID(M_AttributeSetInstance_ID);
line.saveEx(); line.saveEx();
} }else
for(X_C_OrderLineMA attLine : attLines) { for(X_C_OrderLineMA attLine : attLines) {
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy"); attLine.setM_AttributeSetInstance_ID(M_AttributeSetInstance_ID);
Timestamp regDate = (Timestamp) line.get_Value("RegisterDate");
dateFormat.format(new Date(regDate.getTime()));
MAttributeSetInstance ASI = new MAttributeSetInstance(order.getCtx(), attLine.getM_AttributeSetInstance_ID(), order.get_TrxName());
ASI.setSerNo(line.get_ValueAsString("RegisterNo")+"-"+dateFormat.format(new Date(regDate.getTime())));
ASI.setDescription();
ASI.saveEx();
} }
} }
return ""; return "";
} }