开票商品名称下载判断,添加关系表

jg-waiwang-pro
XI_TENG\xixi_ 3 months ago
parent fc4a757efc
commit c13e5c19b2

@ -121,6 +121,72 @@
<select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
a.id AS OUT_ID,
e.f_en_code AS COMP_ID,
f.f_en_code AS DEPT_ID,
a.document_no AS PROD_ZL,
aa.order_line as CK_ORDER,
IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,
i.cargo_name AS STORE_ID,
a.warehousing_time as OUT_DTM,
a.remark as REMARKS,
j.CODE AS MAT_ID,
j.NAME AS MAT_NAME,
aa.spec AS SPECIFICATION,
aa.outbound_unit AS UNIT,
aa.outbound_number AS OUT_QUANTITY,
'2' as OUT_FLAG,
s.contract_no as contract_no,
g.f_real_name as CREATE_EMP_ID,
a.f_creator_time as CREATE_DTM,
k.f_real_name as MODIFY_EMP_ID,
a.f_last_modify_time as MODIFY_DTM,
'0' as CANCLE_YN,
'1' as OUT_TYPE,
'N' as READ_FLAG,
null as READ_TIME,
'' as ERR_MESSAGE,
'N' as ESB_STATUS,
null as ESB_DTM,
'' as ESB_MESSAGE,
IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
aa.batch_number as BATCH_ID,
concat(ab.code,'-',LPAD(ab.ord_ln,3,0)) as PUR_ORDER
FROM
jg_warehousing_outbound a
RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null
-- LEFT JOIN jg_warehousing_storage_product ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
-- LEFT JOIN jg_warehousing_storage ac ON ab.warehousing_storage_id = ac.id AND ac.f_delete_mark is null
LEFT JOIN jg_business_batch ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null
LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL
LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL
LEFT JOIN base_organize e ON a.company_id = e.f_id AND e.f_delete_mark IS NULL
LEFT JOIN base_organize f ON a.department_id = f.f_id AND f.f_delete_mark IS NULL
LEFT JOIN base_user g ON a.f_creator_user_id = g.f_id AND g.f_delete_mark IS NULL
LEFT JOIN jg_contract h ON c.contract_id = h.id AND h.f_delete_mark IS NULL
LEFT JOIN jg_business_cargo i ON aa.outbound_area_id = i.id AND i.f_delete_mark IS NULL
LEFT JOIN jg_product j ON aa.product_id = j.id AND j.f_delete_mark is null
LEFT JOIN base_user k ON a.f_last_modify_user_id = k.f_id AND k.f_delete_mark IS NULL
LEFT JOIN jg_delivery_order l on a.warehousing_id = l.id and l.f_delete_mark is null
LEFT JOIN jg_business_order m on l.business_id = m.id and m.f_delete_mark is null
LEFT JOIN jg_business_order_product_relational n on c.id = n.business_order_id and n.f_delete_mark is null and aa.product_id = n.product_id and aa.outbound_unit = n.sales_main_unit_id and aa.ord_ln = n.ord_ln
LEFT JOIN jg_business_order_product_relational o on m.id = o.business_order_id and o.f_delete_mark is null and aa.product_id = o.product_id and aa.outbound_unit = o.sales_main_unit_id and aa.ord_ln = o.ord_ln
LEFT JOIN jg_contract p ON m.contract_id = p.id AND p.f_delete_mark IS NULL
LEFT JOIN jg_subject_basic q ON m.first_subject_basic_id = q.id AND q.f_delete_mark IS NULL
LEFT JOIN jg_business_order r ON a.business_order_no = r.code AND r.f_delete_mark is null
LEFT JOIN jg_contract s ON r.contract_id = s.id AND s.f_delete_mark is null
WHERE
a.f_delete_mark is null
AND a.id = #{id}
</select>
<select id="saleOutBoundByYunGuan2" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
a.id AS OUT_ID,
e.f_en_code AS COMP_ID,
@ -183,7 +249,8 @@
AND a.id = #{id}
</select>
<!-- <select id="saleOutBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">-->
<!-- <select id="saleOutBoundProductByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">-->
<!-- SELECT-->
<!-- b.CODE AS MAT_ID,-->
<!-- b.NAME AS MAT_NAME,-->

@ -36,6 +36,8 @@ public interface WarehousingOutboundMapper extends BaseMapper<WarehousingOutboun
//运管销售出库
List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(@Param("id") String id);
//运管销售出库第二选择
List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan2(@Param("id") String id);
//// 运管销售出库商品
// List<YunguanSaleOutBoundModel> saleOutBoundProductByYunGuan(@Param("id") String id);

@ -67,4 +67,7 @@ public interface WarehousingOutboundService extends IService<WarehousingOutbound
//运管销售出库
List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id);
//运管销售出库第二选择
List<YunguanSaleOutBoundModel> saleOutBoundByYunGua2(String id);
}

@ -945,4 +945,9 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
public List<YunguanSaleOutBoundModel> saleOutBoundByYunGuan(String id) {
return warehousingOutboundMapper.saleOutBoundByYunGuan(id);
}
@Override
public List<YunguanSaleOutBoundModel> saleOutBoundByYunGua2(String id) {
return warehousingOutboundMapper.saleOutBoundByYunGuan2(id);
}
}

@ -1543,6 +1543,19 @@ public class BusinessOrderController {
return ActionResult.fail("推送失败");
}
}
//销售出库接口第二选择
else{
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList2 = warehousingOutboundService.saleOutBoundByYunGua2(id);
if (yunguanSaleOutBoundModelList2 != null && yunguanSaleOutBoundModelList2.size()>0) {
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList2));
if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")){
return ActionResult.success("推送成功");
}else {
return ActionResult.fail("推送失败");
}
}
}
} else if (type.equals("5")) { //生产加工接口
List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);

@ -1426,19 +1426,22 @@
<span style="font-size: 14px;font-weight: 500;color:rgb(102, 102, 102);">结算汇总</span>
</div>
</el-col>
<el-col :span="8">
<el-input style="width: 200px; margin-right:10px" v-model="dataForm.remark1" />
输入开票商品名称
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add"
<template
v-if="dataForm.cwsettlementcontractList && dataForm.cwsettlementcontractList.length>0 &&dataForm.cwsettlementcontractList[0].businessId=='550709408384942213' ">
<el-col :span="8">
<el-input style="width: 200px; margin-right:10px" v-model="dataForm.remark1" />
输入开票商品名称
<!-- <el-button type="primary" icon="icon-ym icon-ym-btn-add"
@click="openInput">输入开票商品名称</el-button> -->
</el-col>
</el-col>
<el-col :span="8">
<el-input style="width: 200px; margin-right:10px" v-model="dataForm.remark2" />
输入规格
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="openInput1">
确认</el-button>
</el-col>
<el-col :span="8">
<el-input style="width: 200px; margin-right:10px" v-model="dataForm.remark2" />
输入规格
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="openInput1">
确认</el-button>
</el-col>
</template>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="汇总类型">
<JnpfSelect v-model="dataForm.summaryType" @change="changeData('summaryType', -1)"
@ -1833,6 +1836,7 @@ export default {
enabledmark: undefined
},
cwsettlementcontractList: {
businessId: '',
contractId: '',
contractIdOptions: [],
contractPeriodTime: '',
@ -2700,6 +2704,8 @@ export default {
this.dataForm.cwsettlementcontractList[rowIndex].deliveryMethod = row.delivery_method;
this.dataForm.cwsettlementcontractList[rowIndex].modeTransport = row.mode_transport;
this.dataForm.cwsettlementcontractList[rowIndex].costBearingMian = row.cost_bearing_mian;
this.dataForm.cwsettlementcontractList[rowIndex].businessId = row.business_id;
},
subjectChangeData(model, row) {
let aaa = {};

@ -113,7 +113,6 @@ const columnList = [{
},
},
{
"jnpfKey": "billRule",
"fullName": "物料编码",

Loading…
Cancel
Save