productDev/dmMes.git

			@@ -304,9 +304,9 @@
			wrModel.setFactoryId(mp.getFactoryId());
			wrModel.setProcedureId(wStock.getProcedureId());
			wrModel.setBatch(wStock.getBatch());
			wrModel.setUnitId(mp.getUnitId());
			wrModel.setUnitId(wStock.getUnitId());
			wrModel.setPlanId(mp.getPlanId());
			//TODO 目前使用工装主键存储货位主键
			//目前使用工装主键存储货位主键
			wrModel.setAppliancesId(wStock.getId());
			wrModel.setMaterialDonetype(wStock.getQualityType());
			wrModel.setMaterialProcedureId(wStock.getProcedureId());

			@@ -226,7 +226,7 @@

			@Override
			public void wxLoginOut(WxLoginOutDTO wxLoginOutDTO) {
			if(Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){
			if(!Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){
			companyUserExtMapper.update(null,new UpdateWrapper<CompanyUser>()
			.set("UNIONID","").set("OPENID","")
			.eq("id",wxLoginOutDTO.getCompanyUserId())

			@@ -1254,12 +1254,12 @@
			<if test="usermodelInvalidTime != null">
			AND `usermodel`.`INVALID_TIME` = #{usermodelInvalidTime}
			</if>
			<if test="startDate != null">
			<!--<if test="startDate != null">
			AND `a`.`PLAN_DATE` >= #{startDate}
			</if>
			<if test="endDate != null">
			AND #{endDate} >= `a`.`PLAN_DATE`
			</if>
			</if>-->
			<if test="mixParam != null and mixParam!=''">
			AND (mmodel.name like concat('%',#{mixParam},'%') or mmodel.code like concat('%',#{mixParam},'%') or pmodel.name like concat('%',#{mixParam},'%'))
			</if>

	server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/src/main/resources/mappers/PlansExtMapper.xml	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史