Commit 2d7def0d authored by 1650842865's avatar 1650842865

工序外协,选择报价供应商时带出报价;外协采购订单已外发标记

parent 22e95d40
...@@ -47,6 +47,9 @@ ...@@ -47,6 +47,9 @@
<x:hidden name="productType"/> <x:hidden name="productType"/>
<!--x:inputC name="appealNo" label="客诉编号" labelCol="1" fieldCol="2" required="false"/--> <!--x:inputC name="appealNo" label="客诉编号" labelCol="1" fieldCol="2" required="false"/-->
<x:inputC name="exceptionDate" label="异常日期" labelCol="1" fieldCol="2" required="false" wrapper="date"/> <x:inputC name="exceptionDate" label="异常日期" labelCol="1" fieldCol="2" required="false" wrapper="date"/>
<x:checkbox name="needImproveReport" id="needImproveReport" cssStyle="margin-left:10px;" label="客户是否需要改善报告"/>
<x:checkbox name="needGuarantee" id="needGuarantee" cssStyle="margin-left:10px;" label="客户是否需要保证书"/>
</div> </div>
</div> </div>
...@@ -58,9 +61,7 @@ ...@@ -58,9 +61,7 @@
<x:inputC name="brandName" label="品牌名称" labelCol="1" fieldCol="2" required="false"/> <x:inputC name="brandName" label="品牌名称" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="problemTimes" label="问题发生次数" labelCol="1" fieldCol="2" required="false"/> <x:inputC name="problemTimes" label="问题发生次数" labelCol="1" fieldCol="2" required="false"/>
<x:checkbox name="needImproveReport" id="needImproveReport" cssStyle="margin-left:10px;" label="客户是否需要改善报告"/> </div>
<x:checkbox name="needGuarantee" id="needGuarantee" cssStyle="margin-left:10px;" label="客户是否需要保证书"/>
</div>
<div id="purchasegrid"></div> <div id="purchasegrid"></div>
</div> </div>
<div class="hg-form-cols" id="produceDiv"> <div class="hg-form-cols" id="produceDiv">
......
...@@ -86,11 +86,12 @@ function loadOrderItemGrid() { ...@@ -86,11 +86,12 @@ function loadOrderItemGrid() {
fixedCellHeight: true, fixedCellHeight: true,
selectRowButtonOnly: true, selectRowButtonOnly: true,
onAfterEdit:function (item) { onAfterEdit:function (item) {
if(item.column.name == "menge"){ if(item.column.name == "lifnrName"){
Public.ajax(web_app.name + "/processQuotedPrice/findPriceByProductAndProcess.ajax?" + Public.ajax(web_app.name + "/processQuotedPrice/findPriceByProductAndProcess.ajax?" +
"productCode="+item.record.productCode+ "productCode="+item.record.productCode+
"&outProcess="+item.record.wempf+ "&outProcess="+item.record.wempf+
"&number="+item.record.menge, "&number="+item.record.menge+
"&lifnr="+item.record.lifnr,
{ {
},function (data){ },function (data){
orderItemGridManager.updateRow(item.record,{ orderItemGridManager.updateRow(item.record,{
......
...@@ -14,21 +14,12 @@ function loadProcessOutsourceOrderListGrid() { ...@@ -14,21 +14,12 @@ function loadProcessOutsourceOrderListGrid() {
addHandler: function (){ addHandler: function (){
addHandler() addHandler()
}, },
sendOutHandler: {
id: 'sendOutHandler', text: '已外发', img:'fa-clipboard', click: function(){
sendOutHandler();
}
},
}); });
gridManager = UICtrl.grid("#processOutsourceOrderGrid", { gridManager = UICtrl.grid("#processOutsourceOrderGrid", {
columns: [ columns: [
{display: "申请单编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "申请单编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"}, {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "外发状态", name: "sendOut", width: 60, minWidth: 60, type: "string", align: "left", {display: "外发状态", name: "sendOut", width: 60, minWidth: 60, type: "string", align: "left"},
render: function (item) {
return item.sendOut == 1 ? "已外发": "";
}
},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "datetime", align: "left"}, {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "datetime", align: "left"},
{display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"}, {display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"},
{display: "采购订单", name: "ebeln", width: 120, minWidth: 60, type: "string", align: "left"}, {display: "采购订单", name: "ebeln", width: 120, minWidth: 60, type: "string", align: "left"},
...@@ -134,19 +125,3 @@ function doView(processOutsourceId) { ...@@ -134,19 +125,3 @@ function doView(processOutsourceId) {
}); });
} }
function sendOutHandler(){
var rows = gridManager.getSelectedRows();
if (rows.length == 0) {
Public.tip('请选择数据!');
return;
}
var ids = [];
for (var i = 0; i < rows.length; i++){
var row=rows[i];
ids.push(row.processOutsourceId)
}
Public.ajax(web_app.name + "/processOutsource/sendOutProcess.ajax",{ids:$.toJSON(ids)},function () {
reloadGrid();
})
}
\ No newline at end of file
...@@ -16,6 +16,11 @@ function loadGrid() { ...@@ -16,6 +16,11 @@ function loadGrid() {
printHandler(); printHandler();
} }
}, },
sendOutHandler: {
id: 'sendOutHandler', text: '已外发', img:'fa-clipboard', click: function(){
sendOutHandler();
}
},
// revokeApproveHandler: { // revokeApproveHandler: {
// id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () { // id: 'revokeApproveHandler', text: '撤销审批', img: 'fa-trash', click: function () {
// var rows = purchaseOrderGridManager.getSelectedRows(); // var rows = purchaseOrderGridManager.getSelectedRows();
...@@ -38,7 +43,12 @@ function loadGrid() { ...@@ -38,7 +43,12 @@ function loadGrid() {
//debugger //debugger
purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', { purchaseOrderGridManager = UICtrl.grid('#purchaseOrderGrid', {
columns: [ columns: [
{display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"} {display: "状态", name: "statusTextView", width: "100", align: "left", type: "string"},
{display: "外发状态", name: "sendOut", width: "100", align: "left", type: "string",
render: function (item) {
return item.sendOut == 1 ? "已外发": "";
}
}
, {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true} , {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
, {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"} , {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购订单号码", name: "ebeln", width: 150, minWidth: 60, type: "string", align: "center"} , {display: "采购订单号码", name: "ebeln", width: 150, minWidth: 60, type: "string", align: "center"}
...@@ -120,3 +130,24 @@ function printHandler(){ ...@@ -120,3 +130,24 @@ function printHandler(){
Public.openPostWindow(web_app.name+url,{id: row.id}); Public.openPostWindow(web_app.name+url,{id: row.id});
} }
function sendOutHandler(){
var rows = purchaseOrderGridManager.getSelectedRows();
if (rows.length == 0) {
Public.tip('请选择数据!');
return;
}
var ids = [];
for (var i = 0; i < rows.length; i++){
var row=rows[i];
if (row.status != "3"){
Public.tip("请审批完成并发送订单给供应商后再标记已外发");
return false;
}
ids.push(row.id)
}
Public.ajax(web_app.name + "/sapPurchaseOrder/sendOutProcess.ajax",{ids:$.toJSON(ids)},function () {
reloadPurchaseGrid();
})
}
...@@ -275,11 +275,11 @@ ...@@ -275,11 +275,11 @@
<tr> <tr>
<td class="left">产品正面图片: <td class="left">产品正面图片:
<br/> <br/>
<img src='${frontImg?default("")?html}' width="100px"/> <img src='${frontImg?default("")?html}' width="230px"/>
</td> </td>
<td class="left">产品背面图片: <td class="left">产品背面图片:
<br/> <br/>
<img src='${backImg?default("")?html}' width="100px"/> <img src='${backImg?default("")?html}' width="230px"/>
</td> </td>
<td class="left">排版图片:</td> <td class="left">排版图片:</td>
</tr> </tr>
......
...@@ -20,5 +20,4 @@ public interface ProcessOutsourceApplication { ...@@ -20,5 +20,4 @@ public interface ProcessOutsourceApplication {
ProcessOutsource loadProcessOutsource(String id); ProcessOutsource loadProcessOutsource(String id);
void updateProcessOutStatus(List<String> ids);
} }
...@@ -339,14 +339,5 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce ...@@ -339,14 +339,5 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
return processOutsourceRepository.findOne(id); return processOutsourceRepository.findOne(id);
} }
@Override
public void updateProcessOutStatus(List<String> ids) {
List<ProcessOutsource> outsourceList = processOutsourceRepository.findAll(ids);
for (ProcessOutsource processOutsource : outsourceList) {
processOutsource.setSendOut("1");
}
processOutsourceRepository.save(outsourceList);
}
} }
...@@ -99,10 +99,5 @@ public class ProcessOutsourceController extends CommonController { ...@@ -99,10 +99,5 @@ public class ProcessOutsourceController extends CommonController {
return success(); return success();
} }
public String sendOutProcess(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
processOutsourceApplication.updateProcessOutStatus(ids);
return success();
}
} }
...@@ -29,12 +29,6 @@ public class ProcessOutsource extends FlowBillAbstractEntity { ...@@ -29,12 +29,6 @@ public class ProcessOutsource extends FlowBillAbstractEntity {
@Column(name = "situation_desc") @Column(name = "situation_desc")
private String situationDesc; private String situationDesc;
/**
* 已外发 1
*/
@Column(name = "send_out")
private String sendOut;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "processOutsource"; return "processOutsource";
......
...@@ -33,5 +33,5 @@ public interface ProcessQuotedPriceItemApplication { ...@@ -33,5 +33,5 @@ public interface ProcessQuotedPriceItemApplication {
* @param number * @param number
* @return * @return
*/ */
BigDecimal findPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number); BigDecimal findPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number,String lifnr);
} }
...@@ -126,13 +126,13 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple ...@@ -126,13 +126,13 @@ public class ProcessQuotedPriceItemApplicationImpl extends BaseApplication imple
} }
@Override @Override
public BigDecimal findPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number) { public BigDecimal findPriceByProductAndProcess(String productCode, String outProcess, BigDecimal number,String lifnr) {
ProcessQuotedPriceItem quotedPriceItem = processQuotedPriceItemRepository.findByProductCodeAndOutProcess(productCode, outProcess); ProcessQuotedPriceItem quotedPriceItem = processQuotedPriceItemRepository.findByProductCodeAndOutProcess(productCode, outProcess);
BigDecimal price = BigDecimal.ZERO; BigDecimal price = BigDecimal.ZERO;
if (quotedPriceItem != null){ if (quotedPriceItem != null){
ProcessQuotedPrice quotedPrice = processQuotedPriceRepository.findOne(quotedPriceItem.getProcessQuotedPriceId()); ProcessQuotedPrice quotedPrice = processQuotedPriceRepository.findOne(quotedPriceItem.getProcessQuotedPriceId());
//审批完成的 //审批完成的
if (quotedPrice.getStatusId() == BizBillStatus.COMPLETED.getId()){ if (quotedPrice.getStatusId() == BizBillStatus.COMPLETED.getId() && lifnr.equals(quotedPrice.getSupplier())){
List<ProcessQuotedPriceItemNumber> numberList = processQuotedPriceItemNumberApplication.findByProcessQuotedPriceItemId(quotedPriceItem.getId()); List<ProcessQuotedPriceItemNumber> numberList = processQuotedPriceItemNumberApplication.findByProcessQuotedPriceItemId(quotedPriceItem.getId());
List<BigDecimal> decimals = numberList List<BigDecimal> decimals = numberList
.stream() .stream()
......
...@@ -150,9 +150,10 @@ public class ProcessQuotedPriceController extends CommonController { ...@@ -150,9 +150,10 @@ public class ProcessQuotedPriceController extends CommonController {
String productCode = sdo.getString("productCode"); String productCode = sdo.getString("productCode");
String outProcess = sdo.getString("outProcess"); String outProcess = sdo.getString("outProcess");
String number = sdo.getString("number"); String number = sdo.getString("number");
String lifnr = sdo.getString("lifnr");
BigDecimal price = BigDecimal.ZERO; BigDecimal price = BigDecimal.ZERO;
if (StringUtil.isNotBlank(number)){ if (StringUtil.isNotBlank(number)){
price = this.processQuotedPriceItemApplication.findPriceByProductAndProcess(productCode, outProcess, new BigDecimal(number)); price = this.processQuotedPriceItemApplication.findPriceByProductAndProcess(productCode, outProcess, new BigDecimal(number),lifnr);
} }
return success(price); return success(price);
} }
......
...@@ -5,6 +5,7 @@ import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderQueryReq ...@@ -5,6 +5,7 @@ import com.huigou.topsun.sap.purchaseOrder.domain.query.SapPurchaseOrderQueryReq
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderDto; import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderDto;
import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo; import com.huigou.topsun.sap.purchaseOrder.domain.vo.SapPurchaseOrderVo;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -29,4 +30,6 @@ public interface SapPurchaseOrderApplication { ...@@ -29,4 +30,6 @@ public interface SapPurchaseOrderApplication {
String revokeApproval(String id); String revokeApproval(String id);
Map<String, Object> print(String id); Map<String, Object> print(String id);
void updateProcessOutStatus(List<String> ids);
} }
...@@ -19,6 +19,7 @@ import com.huigou.topsun.sap.common.DefaultHttpClient; ...@@ -19,6 +19,7 @@ import com.huigou.topsun.sap.common.DefaultHttpClient;
import com.huigou.topsun.sap.permit.application.SapPermitApplication; import com.huigou.topsun.sap.permit.application.SapPermitApplication;
import com.huigou.topsun.sap.permit.vo.SapPermitItemVo; import com.huigou.topsun.sap.permit.vo.SapPermitItemVo;
import com.huigou.topsun.sap.permit.vo.SapPermitVo; import com.huigou.topsun.sap.permit.vo.SapPermitVo;
import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsource;
import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceMaterial; import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceMaterial;
import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceOrderItem; import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceOrderItem;
import com.huigou.topsun.sap.processOutsource.repository.ProcessOutsourceMaterialRepository; import com.huigou.topsun.sap.processOutsource.repository.ProcessOutsourceMaterialRepository;
...@@ -459,6 +460,15 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu ...@@ -459,6 +460,15 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
return map; return map;
} }
@Override
public void updateProcessOutStatus(List<String> ids) {
List<SapPurchaseOrder> orderList = sapPurchaseOrderRepository.findAll(ids);
for (SapPurchaseOrder sapPurchaseOrder : orderList) {
sapPurchaseOrder.setSendOut("1");
}
sapPurchaseOrderRepository.save(orderList);
}
public Map<String, Object> getSupplierInfo(Map<String, Object> map, String lifnr){ public Map<String, Object> getSupplierInfo(Map<String, Object> map, String lifnr){
lifnr = lifnr.replaceFirst("^0*", ""); lifnr = lifnr.replaceFirst("^0*", "");
List<SuppliersInfo> suppliersInfoList = suppliersInfoRepository.findByPartner(lifnr); List<SuppliersInfo> suppliersInfoList = suppliersInfoRepository.findByPartner(lifnr);
......
...@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody; ...@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -107,4 +108,15 @@ public class SapPurchaseOrderController extends CommonController { ...@@ -107,4 +108,15 @@ public class SapPurchaseOrderController extends CommonController {
String pintPage = String.format("/print/topsun/processOuter.ftl"); String pintPage = String.format("/print/topsun/processOuter.ftl");
return outputAndProcUnitHandlerPDF(pintPage, id, map); return outputAndProcUnitHandlerPDF(pintPage, id, map);
} }
/**
* 更改外发状态
* @return
*/
public String sendOutProcess(){
SDO sdo = this.getSDO();
List<String> ids = sdo.getIds();
sapPurchaseOrderApplication.updateProcessOutStatus(ids);
return success();
}
} }
...@@ -166,6 +166,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity { ...@@ -166,6 +166,12 @@ public class SapPurchaseOrder extends FlowBillAbstractEntity {
@Column(name = "LIFNR") @Column(name = "LIFNR")
private String lifnr; private String lifnr;
/**
* 已外发 1
*/
@Column(name = "send_out")
private String sendOut;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "sapPurchaseOrder"; return "sapPurchaseOrder";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment